Commit 32bc64db authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

correct missed merge conflict.

parent 7f100a23
Pipeline #55378 passed with stage
in 48 seconds
......@@ -89,18 +89,11 @@ public class OptimalStepsModel implements MainModel, PotentialFieldModel, Dynami
this.potentialFieldTarget = iPotentialTargetGrid;
models.add(iPotentialTargetGrid);
<<<<<<< HEAD
this.potentialFieldObstacle = PotentialFieldObstacle.createPotentialField(
modelAttributesList, topography, random, attributesOSM.getObstaclePotentialModel());
modelAttributesList, topography, attributesPedestrian, random, attributesOSM.getObstaclePotentialModel());
this.potentialFieldPedestrian = PotentialFieldAgent.createPotentialField(
modelAttributesList, topography, attributesOSM.getPedestrianPotentialModel());
modelAttributesList, topography, attributesPedestrian, random, attributesOSM.getPedestrianPotentialModel());
=======
this.potentialFieldObstacle = PotentialFieldObstacle.createPotentialField(modelAttributesList, topography, attributesPedestrian, random, attributesOSM.getObstaclePotentialModel());
this.potentialFieldPedestrian = PotentialFieldAgent.createPotentialField(modelAttributesList, topography, attributesPedestrian, random, attributesOSM.getPedestrianPotentialModel());
>>>>>>> develop
Optional<CentroidGroupModel> opCentroidGroupModel = models.stream().
filter(ac -> ac instanceof CentroidGroupModel).map(ac -> (CentroidGroupModel) ac).findAny();
......
package org.vadere.simulator.projects.dataprocessing.processor;
<<<<<<< HEAD
import org.vadere.annotation.factories.dataprocessors.DataProcessorClass;
=======
import org.apache.commons.lang3.tuple.Pair;
>>>>>>> develop
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.models.Model;
import org.vadere.simulator.models.osm.OptimalStepsModel;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment