Projects >> book >>e78e2fbd6feeb7b5c51cdea8f99c0894f8bcc003

Chunk
Conflicting content 
import java.io.File;
import java.io.FileInputStream;
<<<<<<< HEAD
import java.io.FileOutputStream;
=======
>>>>>>> 1df2618be8a8ad4bfe9830235577aa29a903579b
import java.io.IOException;
import java.io.InputStream;
Solution content 
import java.io.FileInputStream;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
File
AnswerTypeClassifier.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import opennlp.maxent.GIS;
import opennlp.maxent.GISModel;
<<<<<<< HEAD
=======
import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
>>>>>>> 1df2618be8a8ad4bfe9830235577aa29a903579b
import opennlp.model.MaxentModel;
import opennlp.model.TwoPassDataIndexer;
import opennlp.tools.chunker.ChunkerME;
Solution content 
import opennlp.maxent.GIS;
import opennlp.maxent.GISModel;
import opennlp.model.MaxentModel;
import opennlp.model.TwoPassDataIndexer;
import opennlp.tools.chunker.ChunkerME;
File
AnswerTypeClassifier.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import opennlp.model.TwoPassDataIndexer;
import opennlp.tools.chunker.ChunkerME;
import opennlp.tools.chunker.ChunkerModel;
<<<<<<< HEAD
import opennlp.tools.doccat.DoccatModel;
=======
>>>>>>> 1df2618be8a8ad4bfe9830235577aa29a903579b
import opennlp.tools.parser.Parse;
import opennlp.tools.parser.Parser;
import opennlp.tools.postag.POSModel;
Solution content 
import opennlp.model.TwoPassDataIndexer;
import opennlp.tools.chunker.ChunkerME;
import opennlp.tools.chunker.ChunkerModel;
import opennlp.tools.doccat.DoccatModel;
import opennlp.tools.parser.Parse;
import opennlp.tools.parser.Parser;
import opennlp.tools.postag.POSModel;
File
AnswerTypeClassifier.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    String trainFile = args[0];
    File outFile = new File(args[1]);
    String modelsDirProp = System.getProperty("model.dir");
<<<<<<< HEAD
    File modelsDir = new File(modelsDirProp);
    String wordnetDir = System.getProperty("wordnet.dir");
=======
    File modelsDir = new File(new File(modelsDirProp), "english");
    String wordnetDir = System.getProperty("wordnet.dir", "book/src/main" + File.separator + "WordNet-3.0"
            + File.separator + "dict");
>>>>>>> 1df2618be8a8ad4bfe9830235577aa29a903579b
    InputStream chunkerStream = new FileInputStream(
        new File(modelsDir,"en-chunker.bin"));
    ChunkerModel chunkerModel = new ChunkerModel(chunkerStream);
Solution content 
    String trainFile = args[0];
    File outFile = new File(args[1]);
    String modelsDirProp = System.getProperty("model.dir");
    File modelsDir = new File(modelsDirProp);
    String wordnetDir = System.getProperty("wordnet.dir");
    InputStream chunkerStream = new FileInputStream(
        new File(modelsDir,"en-chunker.bin"));
    ChunkerModel chunkerModel = new ChunkerModel(chunkerStream);
File
AnswerTypeClassifier.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
import opennlp.model.MaxentModel;
import opennlp.tools.chunker.ChunkerME;
import opennlp.tools.chunker.ChunkerModel;
<<<<<<< HEAD
import opennlp.tools.doccat.DoccatModel;
=======
>>>>>>> 1df2618be8a8ad4bfe9830235577aa29a903579b
import opennlp.tools.parser.Parser;
import opennlp.tools.postag.POSModel;
import opennlp.tools.postag.POSTaggerME;
Solution content 
import opennlp.model.MaxentModel;
import opennlp.tools.chunker.ChunkerME;
import opennlp.tools.chunker.ChunkerModel;
import opennlp.tools.doccat.DoccatModel;
import opennlp.tools.parser.Parser;
import opennlp.tools.postag.POSModel;
import opennlp.tools.postag.POSTaggerME;
File
QuestionQParserPlugin.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            new File(modelsDir,"en-pos-maxent.bin"));
        POSModel posModel = new POSModel(posStream);
        tagger =  new POSTaggerME(posModel); //
<<<<<<< HEAD
        model = new DoccatModel(new FileInputStream( //
            new File(modelDirectory,"en-answer.bin")))
            .getChunkerModel();
=======
        model = new SuffixSensitiveGISModelReader(new File(modelDirectory + File.separator + "qa" +
                File.separator + "answer.bin.gz")).getModel();//
>>>>>>> 1df2618be8a8ad4bfe9830235577aa29a903579b
        probs = new double[model.getNumOutcomes()];
        atcg = new AnswerTypeContextGenerator(new File(wordnetDirectory, "dict"));//
      } catch (IOException e) {
Solution content 
            new File(modelsDir,"en-pos-maxent.bin"));
        POSModel posModel = new POSModel(posStream);
        tagger =  new POSTaggerME(posModel); //
        model = new DoccatModel(new FileInputStream( //
            new File(modelDirectory,"en-answer.bin")))
            .getChunkerModel();
        probs = new double[model.getNumOutcomes()];
        atcg = new AnswerTypeContextGenerator(new File(wordnetDirectory, "dict"));//
      } catch (IOException e) {
File
QuestionQParserPlugin.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation