| Chunk |
|---|
| Conflicting content |
|---|
Functions.tic(); // * save the current state of the experiment <<<<<<< HEAD // save(); ======= save(); int d = deepening ? (int) Math.floor(depth * (currentGeneration/(double)generations)) + 1 : depth; // * revert to best model when increasing depth if(d != previousDepth && model != null) em.setModel(bestModel); previousDepth = d; em.iterate(emSampleSize, d); >>>>>>> ca6418aed3c2eac201877b9e56486e8865be6cab currentGeneration++; } |
| Solution content |
|---|
Functions.tic(); // * save the current state of the experiment // save(); int d = deepening ? (int) Math.floor(depth * (currentGeneration/(double)generations)) + 1 : depth; // * revert to best model when increasing depth if(d != previousDepth && model != null) em.setModel(bestModel); previousDepth = d; em.iterate(emSampleSize, d); currentGeneration++; } |
| File |
|---|
| IFSModelEM.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Cast expression |
| Comment |
| If statement |
| Method invocation |
| Variable |