| Chunk |
|---|
| Conflicting content |
|---|
valOut.add(ratingStdDev, one);
context.write(keyOut, valOut);
} else {
<<<<<<< HEAD
//if correlation is above min threshold
//context.getCounter("Record type count", "Correlation").increment(1);
=======
//item correlation
context.getCounter("Record type count", "Correlation").increment(1);
>>>>>>> 2dc0b49f5db727cbd0dab4acfd4e71ec622d8036
correlation = Integer.parseInt( items[2]);
correlationLength = Integer.parseInt(items[3]);
|
| Solution content |
|---|
valOut.add(ratingStdDev, one);
context.write(keyOut, valOut);
} else {
//item correlation
//context.getCounter("Record type count", "Correlation").increment(1);
correlation = Integer.parseInt( items[2]);
correlationLength = Integer.parseInt(items[3]);
|
| File |
|---|
| UtilityPredictor.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| Method invocation |