6.5.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit dc52c049 authored by Jakob Schöttl's avatar Jakob Schöttl

Fix class, add comments, rename variables, remove unused code

parent e45b26cf
...@@ -21,54 +21,48 @@ import org.vadere.util.geometry.shapes.VShape; ...@@ -21,54 +21,48 @@ import org.vadere.util.geometry.shapes.VShape;
* *
*/ */
public final class AgentWrapper extends ScenarioElement { public final class AgentWrapper extends ScenarioElement {
/** we only need the radius from the attributes. */
private final AttributesAgent attributes;
/** the wrapped store object. */ /** the wrapped store object. */
private Agent store; private Agent agent;
AgentWrapper(final VPoint position) { AgentWrapper(final VPoint position) {
this.attributes = new AttributesAgent(); // use a Pedestrian as default
this.store = new Pedestrian(this.attributes, new Random()); // use a Pedestrian as default // TODO this default does not make much sense
this.store.setPosition(position); this.agent = new Pedestrian(new AttributesAgent(), new Random());
this.store.setTargets(new LinkedList<Integer>()); this.agent.setPosition(position);
this.agent.setTargets(new LinkedList<Integer>());
} }
public AgentWrapper(final Agent store) { public AgentWrapper(final Agent agent) {
this.attributes = store.getAttributes(); this.agent = (Agent) agent.clone();
this.store = store.clone();
}
private AgentWrapper(final AgentWrapper wrapper) {
this.attributes = wrapper.attributes;
this.store = wrapper.store.clone();
} }
public Agent getAgentInitialStore() { public Agent getAgentInitialStore() {
return store; return agent;
} }
public void setAgentInitialStore(final Agent store) { public void setAgentInitialStore(final Agent store) {
this.store = store; this.agent = store;
} }
@Override @Override
public VShape getShape() { public VShape getShape() {
return store.getShape(); return agent.getShape();
} }
@Override @Override
public int getId() { public int getId() {
return attributes.getId(); return agent.getId();
} }
@Override @Override
public ScenarioElementType getType() { public ScenarioElementType getType() {
// TODO bug - this is a agent wrapper, not necessarily an pedestrian wrapper
return ScenarioElementType.PEDESTRIAN; return ScenarioElementType.PEDESTRIAN;
} }
@Override @Override
public Attributes getAttributes() { public Attributes getAttributes() {
return attributes; return agent.getAttributes();
} }
} }
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