Commit 2949815e authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier

Created subdirs "models" and "helper" under "psychology/cognition" and "psychology/perception"

parent 9ba8c52d
package org.vadere.simulator.control.psychology.cognition; package org.vadere.simulator.control.psychology.cognition.helper;
import org.vadere.simulator.control.psychology.cognition.models.ICognitionModel;
import org.vadere.simulator.projects.ScenarioStore; import org.vadere.simulator.projects.ScenarioStore;
import org.vadere.util.reflection.DynamicClassInstantiator; import org.vadere.util.reflection.DynamicClassInstantiator;
......
package org.vadere.simulator.control.psychology.cognition; package org.vadere.simulator.control.psychology.cognition.models;
import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.cognition.SelfCategory;
import org.vadere.state.psychology.perception.types.ChangeTargetScripted; import org.vadere.state.psychology.perception.types.ChangeTargetScripted;
import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Pedestrian;
import org.vadere.state.scenario.Topography; import org.vadere.state.scenario.Topography;
import org.vadere.state.simulation.FootstepHistory;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
......
package org.vadere.simulator.control.psychology.cognition; package org.vadere.simulator.control.psychology.cognition.models;
import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.cognition.SelfCategory;
import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.control.psychology.cognition; package org.vadere.simulator.control.psychology.cognition.models;
import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesAgent;
import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.cognition.SelfCategory;
......
package org.vadere.simulator.control.psychology.cognition; package org.vadere.simulator.control.psychology.cognition.models;
import org.vadere.simulator.models.Model; import org.vadere.simulator.models.Model;
import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.cognition.SelfCategory;
......
package org.vadere.simulator.control.psychology.cognition; package org.vadere.simulator.control.psychology.cognition.models;
import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.cognition.SelfCategory;
import org.vadere.state.psychology.perception.types.*; import org.vadere.state.psychology.perception.types.*;
......
package org.vadere.simulator.control.psychology.cognition; package org.vadere.simulator.control.psychology.cognition.models;
import org.vadere.state.psychology.cognition.GroupMembership; import org.vadere.state.psychology.cognition.GroupMembership;
import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.cognition.SelfCategory;
......
package org.vadere.simulator.control.psychology.perception; package org.vadere.simulator.control.psychology.perception.helper;
import org.vadere.simulator.models.MainModel; import org.vadere.simulator.control.psychology.perception.models.IPerceptionModel;
import org.vadere.simulator.models.SubModelBuilder;
import org.vadere.simulator.projects.ScenarioStore; import org.vadere.simulator.projects.ScenarioStore;
import org.vadere.state.attributes.AttributesSimulation;
import org.vadere.util.reflection.DynamicClassInstantiator; import org.vadere.util.reflection.DynamicClassInstantiator;
import java.util.Random;
/** /**
* This class encapsulates the creation of a concrete {@link IPerceptionModel} * This class encapsulates the creation of a concrete {@link IPerceptionModel}
* which is defined by the user in the JSON scenario description. * which is defined by the user in the JSON scenario description.
......
package org.vadere.simulator.control.psychology.perception; package org.vadere.simulator.control.psychology.perception.models;
import org.vadere.simulator.models.Model; import org.vadere.simulator.models.Model;
import org.vadere.state.psychology.perception.types.ElapsedTime; import org.vadere.state.psychology.perception.types.ElapsedTime;
......
package org.vadere.simulator.control.psychology.perception; package org.vadere.simulator.control.psychology.perception.models;
import org.vadere.state.psychology.perception.types.*; import org.vadere.state.psychology.perception.types.*;
import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.control.simulation; package org.vadere.simulator.control.simulation;
import it.unimi.dsi.fastutil.io.FastBufferedInputStream; import it.unimi.dsi.fastutil.io.FastBufferedInputStream;
import it.unimi.dsi.fastutil.io.FastBufferedOutputStream;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
...@@ -12,16 +11,15 @@ import org.vadere.meshing.mesh.gen.AVertex; ...@@ -12,16 +11,15 @@ import org.vadere.meshing.mesh.gen.AVertex;
import org.vadere.meshing.utils.io.poly.MeshPolyReader; import org.vadere.meshing.utils.io.poly.MeshPolyReader;
import org.vadere.meshing.utils.io.poly.MeshPolyWriter; import org.vadere.meshing.utils.io.poly.MeshPolyWriter;
import org.vadere.simulator.context.VadereContext; import org.vadere.simulator.context.VadereContext;
import org.vadere.simulator.control.psychology.cognition.CognitionModelBuilder; import org.vadere.simulator.control.psychology.cognition.helper.CognitionModelBuilder;
import org.vadere.simulator.control.psychology.cognition.ICognitionModel; import org.vadere.simulator.control.psychology.cognition.models.ICognitionModel;
import org.vadere.simulator.control.psychology.perception.IPerceptionModel; import org.vadere.simulator.control.psychology.perception.models.IPerceptionModel;
import org.vadere.simulator.control.psychology.perception.PerceptionModelBuilder; import org.vadere.simulator.control.psychology.perception.helper.PerceptionModelBuilder;
import org.vadere.simulator.control.psychology.perception.StimulusController; import org.vadere.simulator.control.psychology.perception.StimulusController;
import org.vadere.simulator.control.scenarioelements.TargetChangerController; import org.vadere.simulator.control.scenarioelements.TargetChangerController;
import org.vadere.simulator.models.MainModel; import org.vadere.simulator.models.MainModel;
import org.vadere.simulator.models.MainModelBuilder; import org.vadere.simulator.models.MainModelBuilder;
import org.vadere.simulator.models.potential.solver.EikonalSolverCacheProvider; import org.vadere.simulator.models.potential.solver.EikonalSolverCacheProvider;
import org.vadere.simulator.models.potential.solver.calculators.mesh.MeshEikonalSolverFMM;
import org.vadere.simulator.projects.Domain; import org.vadere.simulator.projects.Domain;
import org.vadere.simulator.projects.RunnableFinishedListener; import org.vadere.simulator.projects.RunnableFinishedListener;
import org.vadere.simulator.projects.Scenario; import org.vadere.simulator.projects.Scenario;
...@@ -36,7 +34,6 @@ import org.vadere.util.logging.Logger; ...@@ -36,7 +34,6 @@ import org.vadere.util.logging.Logger;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
......
package org.vadere.simulator.control.simulation; package org.vadere.simulator.control.simulation;
import org.vadere.simulator.control.factory.SourceControllerFactory; import org.vadere.simulator.control.factory.SourceControllerFactory;
import org.vadere.simulator.control.psychology.cognition.ICognitionModel; import org.vadere.simulator.control.psychology.cognition.models.ICognitionModel;
import org.vadere.simulator.control.psychology.perception.IPerceptionModel; import org.vadere.simulator.control.psychology.perception.models.IPerceptionModel;
import org.vadere.simulator.control.psychology.perception.StimulusController; import org.vadere.simulator.control.psychology.perception.StimulusController;
import org.vadere.simulator.control.scenarioelements.*; import org.vadere.simulator.control.scenarioelements.*;
import org.vadere.simulator.models.DynamicElementFactory; import org.vadere.simulator.models.DynamicElementFactory;
......
package org.vadere.simulator.control.psychology.cognition; package org.vadere.simulator.control.psychology.cognition;
import org.junit.Test; import org.junit.Test;
import org.vadere.simulator.control.psychology.cognition.models.CounterflowCognitionModel;
import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesAgent;
import org.vadere.state.attributes.scenario.AttributesTarget; import org.vadere.state.attributes.scenario.AttributesTarget;
import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.cognition.SelfCategory;
......
package org.vadere.simulator.control.psychology.cognition; package org.vadere.simulator.control.psychology.cognition;
import org.junit.Test; import org.junit.Test;
import org.vadere.simulator.control.psychology.cognition.models.SimpleCognitionModel;
import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesAgent;
import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.cognition.SelfCategory;
import org.vadere.state.psychology.perception.types.*; import org.vadere.state.psychology.perception.types.*;
......
package org.vadere.simulator.control.psychology.perception; package org.vadere.simulator.control.psychology.perception;
import org.junit.Test; import org.junit.Test;
import org.vadere.simulator.control.psychology.perception.models.SimplePerceptionModel;
import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesAgent;
import org.vadere.state.attributes.scenario.AttributesTarget; import org.vadere.state.attributes.scenario.AttributesTarget;
import org.vadere.state.psychology.perception.types.*; import org.vadere.state.psychology.perception.types.*;
......
Markdown is supported
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