Projects >> blog >>f72650deab6f33312f4303ecb2325da391f67a25

Chunk
Conflicting content 
import java.util.ArrayList;
import java.util.Collection;
<<<<<<< HEAD
import java.util.Iterator;
=======
import java.util.LinkedList;
>>>>>>> 24ab6acd77b9e9225d45c198cdb1e3a25dda9d2e
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
Solution content 
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
File
ParticleFilter.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
  private void reset() {
    System.out.println("Using " + numParticles + " particles...");
<<<<<<< HEAD
    int numTimeSlicesInMemory = useDecayedMCMC ? dmhSampler.getMaxRecall() : 1;
    if (evidence == null) {
      evidence = new Evidence(model);
    }
    if (queries == null) {
      queries = new Queries(model);
    }
    if (useDecayedMCMC) {
      dmhSampler.initialize(evidence, queries);
    }
=======
    int numTimeSlicesInMemory = 1;
    if (evidence == null)
      evidence = new Evidence();
    if (queries == null)
      queries = new LinkedList();
>>>>>>> 24ab6acd77b9e9225d45c198cdb1e3a25dda9d2e
    particles = new ArrayList();
    for (int i = 0; i < numParticles; i++) {
      Particle newParticle = makeParticle(idTypes, numTimeSlicesInMemory);
Solution content 
  private void reset() {
    System.out.println("Using " + numParticles + " particles...");
    int numTimeSlicesInMemory = 1;
    if (evidence == null) {
      evidence = new Evidence(model);
    }
    if (queries == null) {
      queries = new Queries(model);
    }
    particles = new ArrayList();
    for (int i = 0; i < numParticles; i++) {
      Particle newParticle = makeParticle(idTypes, numTimeSlicesInMemory);
File
ParticleFilter.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable