| Chunk |
|---|
| Conflicting content |
|---|
public static void main (String[] args){
SUU suu = new SUU();
<<<<<<< HEAD
suu.setNumParticle(1000);
if (args.length == 0){
SampledParticleFilterRunner runner = suu.makeRunner("ex_inprog//logistics//policies//monopoly_markov.mblog", "ex_inprog//logistics//policies//donothingpolicy");
=======
suu.setNumParticle(1);
SampledParticleFilterRunner runner = suu.makeRunner("ex_inprog//logistics//policies//monopoly_markov.mblog", "ex_inprog//logistics//policies//donothingpolicy", "ex_inprog//logistics//policies//forced_query");
//SampledParticleFilterRunner runner = suu.makeRunner("ex_inprog//logistics//policies//monopoly_markov.mblog", "ex_inprog//logistics//policies//donothingpolicy");
>>>>>>> 6a07b23f167fb3dc57100efb540b52850cbab94c
//SampledParticleFilterRunner runner = suu.makeRunner("ex_inprog//logistics//policies//monopoly_color_wp.mblog", "ex_inprog//logistics//policies//monopoly_policy");
runner.run();
} |
| Solution content |
|---|
public static void main (String[] args){
SUU suu = new SUU();
suu.setNumParticle(1);
SampledParticleFilterRunner runner = suu.makeRunner("ex_inprog//logistics//policies//monopoly_markov.mblog", "ex_inprog//logistics//policies//donothingpolicy", "ex_inprog//logistics//policies//forced_query");
//SampledParticleFilterRunner runner = suu.makeRunner("ex_inprog//logistics//policies//monopoly_markov.mblog", "ex_inprog//logistics//policies//donothingpolicy");
//SampledParticleFilterRunner runner = suu.makeRunner("ex_inprog//logistics//policies//monopoly_color_wp.mblog", "ex_inprog//logistics//policies//monopoly_policy");
runner.run();
} |
| File |
|---|
| DepthFirstPolicyEvaluationRunner.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Variable |