Projects >> Ivory >>fb7fde43c125178cc6f407906d8a6d0390fa3852

Chunk
Conflicting content 
import org.apache.log4j.Level;
import org.apache.log4j.Logger;

<<<<<<< HEAD
=======
import edu.stanford.nlp.util.StringUtils;
>>>>>>> be3f78e92cd021eb6a3729aacd9558b0a0625a64
import edu.umd.cloud9.io.map.HMapIFW;
import edu.umd.cloud9.io.map.HMapSFW;
import edu.umd.cloud9.io.map.HMapSIW;
Solution content 
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import edu.stanford.nlp.util.StringUtils;
import edu.umd.cloud9.io.map.HMapIFW;
import edu.umd.cloud9.io.map.HMapSFW;
import edu.umd.cloud9.io.map.HMapSIW;
File
CLIRUtils.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
   * This method converts the output of GIZA into a TTable_monolithic_IFAs object. 
   * For each source language term, top numTrans entries (with highest translation probability) are kept, unless the top K < numTrans entries have a cumulatite probability above probThreshold.
   * 
<<<<<<< HEAD
   * @param inputFile
   * 		output of GIZA (probability values from source language to target language. In GIZA, format of each line should be: 
   * 			[target-word1] [source-word] [prob1]
   * 			[target-word2] [source-word] [prob2]
=======
   * @param filename
   *    output of GIZA (probability values from source language to target language. In GIZA, format of each line should be: 
   *      [target-word1] [source-word] [prob1]
   *      [target-word2] [source-word] [prob2]
>>>>>>> be3f78e92cd021eb6a3729aacd9558b0a0625a64
   *          ...
   * @param srcVocabFile
   *    path where created source vocabulary (VocabularyWritable) will be written
Solution content 
   * This method converts the output of GIZA into a TTable_monolithic_IFAs object. 
   * For each source language term, top numTrans entries (with highest translation probability) are kept, unless the top K < numTrans entries have a cumulatite probability above probThreshold.
   * 
   * @param filename
   *    output of GIZA (probability values from source language to target language. In GIZA, format of each line should be: 
   *      [target-word1] [source-word] [prob1]
   *      [target-word2] [source-word] [prob2]
   *          ...
   * @param srcVocabFile
   *    path where created source vocabulary (VocabularyWritable) will be written
File
CLIRUtils.java
Developer's decision
Version 2
Kind of conflict
Comment