Projects >> Ivory >>88e9a0f8f17c690c552bfe12168c09f148291ae6

Chunk
Conflicting content 
			// compute score via scoring model
			float score = ((Bm25) scoringModel).computeDocumentWeight(tf, df, docLen);
<<<<<<< HEAD
			sLogger.debug(eTerm+" "+tf+" "+df+" "+score);
=======
			//			sLogger.debug(eTerm+" "+tf+" "+df+" "+score);
>>>>>>> 16f3d32ecc6a58948682625bcbcafc42085977ba
			if(score>0){
				v.put(eTerm, score);
				if(isNormalize){
Solution content 
			// compute score via scoring model
			float score = ((Bm25) scoringModel).computeDocumentWeight(tf, df, docLen);
<<<<<<< HEAD
			sLogger.debug(eTerm+" "+tf+" "+df+" "+score);
=======
			//			sLogger.debug(eTerm+" "+tf+" "+df+" "+score);
>>>>>>> sentence_extraction
			if(score>0){
				v.put(eTerm, score);
				if(isNormalize){
File
CLIRUtils.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
		if(sLogger == null){
			sLogger = logger;
		}
<<<<<<< HEAD
		
=======

>>>>>>> 16f3d32ecc6a58948682625bcbcafc42085977ba
		HMapSFW v = new HMapSFW();
		float normalization=0;
		for(edu.umd.cloud9.util.map.MapKI.Entry entry : tfTable.entrySet()){
Solution content 
		if(sLogger == null){
			sLogger = logger;
		}
<<<<<<< HEAD
		
=======

>>>>>>> sentence_extraction
		HMapSFW v = new HMapSFW();
		float normalization=0;
		for(edu.umd.cloud9.util.map.MapKI.Entry entry : tfTable.entrySet()){
File
CLIRUtils.java
Developer's decision
Manual
Kind of conflict
Blank
Chunk
Conflicting content 
			String eTerm = entry.getKey();
			int tf = entry.getValue();
			int df = dfTable.getDF(eTerm);
<<<<<<< HEAD
		
			// compute score via scoring model
			float score = ((Bm25) scoringModel).computeDocumentWeight(tf, df, docLen);
			sLogger.debug(eTerm+" "+tf+" "+df+" "+score);
=======

			// compute score via scoring model
			float score = ((Bm25) scoringModel).computeDocumentWeight(tf, df, docLen);
			//			sLogger.debug(eTerm+" "+tf+" "+df+" "+score);
>>>>>>> 16f3d32ecc6a58948682625bcbcafc42085977ba
			if(score>0){
				v.put(eTerm, score);
				if(isNormalize){
Solution content 
			String eTerm = entry.getKey();
			int tf = entry.getValue();
			int df = dfTable.getDF(eTerm);
<<<<<<< HEAD
		
			// compute score via scoring model
			float score = ((Bm25) scoringModel).computeDocumentWeight(tf, df, docLen);
			sLogger.debug(eTerm+" "+tf+" "+df+" "+score);
=======

			// compute score via scoring model
			float score = ((Bm25) scoringModel).computeDocumentWeight(tf, df, docLen);
			//			sLogger.debug(eTerm+" "+tf+" "+df+" "+score);
>>>>>>> sentence_extraction
			if(score>0){
				v.put(eTerm, score);
				if(isNormalize){
File
CLIRUtils.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable