Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
vadere
vadere
Commits
941c94cd
Commit
941c94cd
authored
Jul 09, 2018
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refector ScenarioStore: use private variables instead of public.
parent
a523b13a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
97 additions
and
54 deletions
+97
-54
VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationModel.java
...e/gui/postvisualization/model/PostvisualizationModel.java
+1
-1
VadereGui/src/org/vadere/gui/projectview/view/TextView.java
VadereGui/src/org/vadere/gui/projectview/view/TextView.java
+2
-2
VadereSimulator/src/org/vadere/simulator/control/Simulation.java
...imulator/src/org/vadere/simulator/control/Simulation.java
+1
-1
VadereSimulator/src/org/vadere/simulator/entrypoints/ScenarioBuilder.java
...src/org/vadere/simulator/entrypoints/ScenarioBuilder.java
+4
-4
VadereSimulator/src/org/vadere/simulator/models/MainModelBuilder.java
...tor/src/org/vadere/simulator/models/MainModelBuilder.java
+3
-3
VadereSimulator/src/org/vadere/simulator/projects/Scenario.java
...Simulator/src/org/vadere/simulator/projects/Scenario.java
+20
-26
VadereSimulator/src/org/vadere/simulator/projects/ScenarioRun.java
...ulator/src/org/vadere/simulator/projects/ScenarioRun.java
+4
-4
VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java
...ator/src/org/vadere/simulator/projects/ScenarioStore.java
+54
-5
VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java
...r/src/org/vadere/simulator/projects/io/JsonConverter.java
+8
-8
No files found.
VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationModel.java
View file @
941c94cd
...
...
@@ -300,7 +300,7 @@ public class PostvisualizationModel extends SimulationModel<PostvisualizationCon
private
double
getSimTimeInSec
(
final
Step
step
)
{
return
step
.
getSimTimeInSec
()
.
orElse
(
step
.
getStepNumber
()
*
vadere
.
getScenarioStore
().
a
ttributesSimulation
.
getSimTimeStepLength
());
.
orElse
(
step
.
getStepNumber
()
*
vadere
.
getScenarioStore
().
getA
ttributesSimulation
()
.
getSimTimeStepLength
());
}
public
synchronized
void
setPotentialFieldContainer
(
final
PotentialFieldContainer
container
)
{
...
...
VadereGui/src/org/vadere/gui/projectview/view/TextView.java
View file @
941c94cd
...
...
@@ -173,7 +173,7 @@ public class TextView extends JPanel implements IJsonView {
switch
(
attributeType
)
{
case
MODEL:
ModelDefinition
modelDefinition
=
JsonConverter
.
deserializeModelDefinition
(
json
);
currentScenario
.
getScenarioStore
().
m
ainModel
=
modelDefinition
.
getMainModel
();
currentScenario
.
getScenarioStore
().
setM
ainModel
(
modelDefinition
.
getMainModel
()
)
;
currentScenario
.
setAttributesModel
(
modelDefinition
.
getAttributesList
());
break
;
case
SIMULATION:
...
...
@@ -220,7 +220,7 @@ public class TextView extends JPanel implements IJsonView {
switch
(
attributeType
)
{
case
MODEL:
txtrTextfiletextarea
.
setText
(
StateJsonConverter
.
serializeMainModelAttributesModelBundle
(
scenario
.
getModelAttributes
(),
scenario
.
getScenarioStore
().
m
ainModel
));
scenario
.
getModelAttributes
(),
scenario
.
getScenarioStore
().
getM
ainModel
()
));
break
;
case
SIMULATION:
txtrTextfiletextarea
...
...
VadereSimulator/src/org/vadere/simulator/control/Simulation.java
View file @
941c94cd
...
...
@@ -67,7 +67,7 @@ public class Simulation {
this
.
name
=
name
;
this
.
mainModel
=
mainModel
;
this
.
scenarioStore
=
scenarioStore
;
this
.
attributesSimulation
=
scenarioStore
.
a
ttributesSimulation
;
this
.
attributesSimulation
=
scenarioStore
.
getA
ttributesSimulation
()
;
this
.
attributesAgent
=
scenarioStore
.
getTopography
().
getAttributesPedestrian
();
this
.
sourceControllers
=
new
LinkedList
<>();
this
.
targetControllers
=
new
LinkedList
<>();
...
...
VadereSimulator/src/org/vadere/simulator/entrypoints/ScenarioBuilder.java
View file @
941c94cd
...
...
@@ -61,9 +61,9 @@ public class ScenarioBuilder {
// TODO: duplicated code
if
(
AttributesSimulation
.
class
==
clazz
){
builder
=
new
AttributesBuilder
<>((
E
)
store
.
a
ttributesSimulation
);
builder
=
new
AttributesBuilder
<>((
E
)
store
.
getA
ttributesSimulation
()
);
builder
.
setField
(
fieldName
,
value
);
store
.
a
ttributesSimulation
=
(
AttributesSimulation
)
builder
.
build
();
store
.
setA
ttributesSimulation
(
(
AttributesSimulation
)
builder
.
build
()
)
;
}
else
if
(
AttributesAgent
.
class
==
clazz
){
builder
=
new
AttributesBuilder
<>((
E
)
store
.
getTopography
().
getAttributesPedestrian
());
...
...
@@ -84,8 +84,8 @@ public class ScenarioBuilder {
else
{
builder
=
new
AttributesBuilder
<>(
store
.
getAttributes
(
clazz
));
builder
.
setField
(
fieldName
,
value
);
store
.
a
ttributes
List
.
remove
If
(
attributes
->
attributes
.
getClass
()
==
clazz
);
store
.
attributes
List
.
add
(
builder
.
build
());
store
.
removeA
ttributesIf
(
attributes
->
attributes
.
getClass
()
==
clazz
);
store
.
a
ddA
ttributes
(
builder
.
build
());
}
}
...
...
VadereSimulator/src/org/vadere/simulator/models/MainModelBuilder.java
View file @
941c94cd
...
...
@@ -25,7 +25,7 @@ public class MainModelBuilder {
public
void
createModelAndRandom
()
throws
ClassNotFoundException
,
InstantiationException
,
IllegalAccessException
{
final
AttributesSimulation
attributesSimulation
=
scenarioStore
.
a
ttributesSimulation
;
final
AttributesSimulation
attributesSimulation
=
scenarioStore
.
getA
ttributesSimulation
()
;
if
(
attributesSimulation
.
isUseRandomSeed
())
{
random
=
new
Random
(
attributesSimulation
.
getRandomSeed
());
}
else
{
...
...
@@ -45,10 +45,10 @@ public class MainModelBuilder {
}
private
MainModel
instantiateMainModel
(
Random
random
)
{
String
mainModelName
=
scenarioStore
.
m
ainModel
;
String
mainModelName
=
scenarioStore
.
getM
ainModel
()
;
DynamicClassInstantiator
<
MainModel
>
instantiator
=
new
DynamicClassInstantiator
<>();
MainModel
mainModel
=
instantiator
.
createObject
(
mainModelName
);
mainModel
.
initialize
(
scenarioStore
.
a
ttributesList
,
scenarioStore
.
getTopography
(),
mainModel
.
initialize
(
scenarioStore
.
getA
ttributesList
()
,
scenarioStore
.
getTopography
(),
scenarioStore
.
getTopography
().
getAttributesPedestrian
(),
random
);
return
mainModel
;
}
...
...
VadereSimulator/src/org/vadere/simulator/projects/Scenario.java
View file @
941c94cd
...
...
@@ -11,6 +11,7 @@ import java.util.List;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.jetbrains.annotations.NotNull
;
import
org.vadere.simulator.projects.dataprocessing.DataProcessingJsonManager
;
import
org.vadere.simulator.projects.io.JsonConverter
;
import
org.vadere.state.attributes.Attributes
;
...
...
@@ -32,24 +33,17 @@ import difflib.DiffUtils;
public
class
Scenario
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
Scenario
.
class
);
private
ScenarioStore
scenarioStore
;
private
DataProcessingJsonManager
dataProcessingJsonManager
;
private
String
savedStateSerialized
;
private
String
currentStateSerialized
;
public
Scenario
(
final
String
name
)
{
this
(
name
,
new
ScenarioStore
(
name
));
}
public
Scenario
(
final
ScenarioStore
store
)
{
this
(
store
.
name
,
store
);
this
(
new
ScenarioStore
(
name
));
}
public
Scenario
(
final
String
name
,
final
ScenarioStore
store
)
{
public
Scenario
(
@NotNull
final
ScenarioStore
store
)
{
this
.
scenarioStore
=
store
;
this
.
dataProcessingJsonManager
=
new
DataProcessingJsonManager
();
...
...
@@ -88,7 +82,7 @@ public class Scenario {
}
public
String
getName
()
{
return
scenarioStore
.
n
ame
;
return
scenarioStore
.
getN
ame
()
;
}
public
ScenarioStore
getScenarioStore
()
{
...
...
@@ -96,7 +90,7 @@ public class Scenario {
}
public
List
<
Attributes
>
getModelAttributes
()
{
return
scenarioStore
.
a
ttributesList
;
return
scenarioStore
.
getA
ttributesList
()
;
}
public
AttributesAgent
getAttributesPedestrian
()
{
...
...
@@ -104,26 +98,26 @@ public class Scenario {
}
public
AttributesSimulation
getAttributesSimulation
()
{
return
scenarioStore
.
a
ttributesSimulation
;
return
scenarioStore
.
getA
ttributesSimulation
()
;
}
public
Topography
getTopography
()
{
return
scenarioStore
.
getTopography
();
}
public
void
setName
(
String
name
)
{
this
.
scenarioStore
.
name
=
name
;
public
void
setName
(
@NotNull
final
String
name
)
{
this
.
scenarioStore
.
setName
(
name
)
;
}
public
void
setAttributesModel
(
List
<
Attributes
>
attributesList
)
{
scenarioStore
.
a
ttributesList
=
attributesList
;
public
void
setAttributesModel
(
@NotNull
final
List
<
Attributes
>
attributesList
)
{
scenarioStore
.
setA
ttributesList
(
attributesList
)
;
}
public
void
setAttributesSimulation
(
AttributesSimulation
attributesSimulation
)
{
this
.
scenarioStore
.
a
ttributesSimulation
=
attributesSimulation
;
public
void
setAttributesSimulation
(
@NotNull
final
AttributesSimulation
attributesSimulation
)
{
this
.
scenarioStore
.
setA
ttributesSimulation
(
attributesSimulation
)
;
}
public
void
setTopography
(
final
Topography
topography
)
{
public
void
setTopography
(
@NotNull
final
Topography
topography
)
{
scenarioStore
.
setTopography
(
topography
);
}
...
...
@@ -142,7 +136,7 @@ public class Scenario {
}
public
String
getDisplayName
()
{
return
scenarioStore
.
n
ame
+
(
hasUnsavedChanges
()
?
"*"
:
""
);
return
scenarioStore
.
getN
ame
()
+
(
hasUnsavedChanges
()
?
"*"
:
""
);
}
public
void
discardChanges
()
{
...
...
@@ -157,16 +151,16 @@ public class Scenario {
}
public
String
getDescription
()
{
return
scenarioStore
.
d
escription
;
return
scenarioStore
.
getD
escription
()
;
}
public
void
setDescription
(
String
description
)
{
scenarioStore
.
d
escription
=
description
;
scenarioStore
.
setD
escription
(
description
)
;
}
public
String
readyToRunResponse
()
{
// TODO [priority=medium] [task=check] add more conditions
if
(
scenarioStore
.
m
ainModel
==
null
)
{
return
scenarioStore
.
n
ame
+
": no mainModel is set"
;
if
(
scenarioStore
.
getM
ainModel
()
==
null
)
{
return
scenarioStore
.
getN
ame
()
+
": no mainModel is set"
;
}
return
null
;
}
...
...
@@ -175,11 +169,11 @@ public class Scenario {
return
dataProcessingJsonManager
;
}
public
void
setDataProcessingJsonManager
(
final
DataProcessingJsonManager
manager
)
{
public
void
setDataProcessingJsonManager
(
@NotNull
final
DataProcessingJsonManager
manager
)
{
this
.
dataProcessingJsonManager
=
manager
;
}
public
void
saveToOutputPath
(
final
Path
outputPath
)
{
public
void
saveToOutputPath
(
@NotNull
final
Path
outputPath
)
{
try
(
PrintWriter
out
=
new
PrintWriter
(
Paths
.
get
(
outputPath
.
toString
(),
getName
()
+
IOUtils
.
SCENARIO_FILE_EXTENSION
).
toString
()))
{
out
.
println
(
JsonConverter
.
serializeScenarioRunManager
(
this
,
true
));
}
catch
(
IOException
e
)
{
...
...
VadereSimulator/src/org/vadere/simulator/projects/ScenarioRun.java
View file @
941c94cd
...
...
@@ -84,7 +84,7 @@ public class ScenarioRun implements Runnable {
final
Random
random
=
modelBuilder
.
getRandom
();
// prepare processors and simulation data writer
if
(
scenarioStore
.
a
ttributesSimulation
.
isWriteSimulationData
())
{
if
(
scenarioStore
.
getA
ttributesSimulation
()
.
isWriteSimulationData
())
{
processorManager
=
dataProcessingJsonManager
.
createProcessorManager
(
mainModel
);
}
...
...
@@ -97,7 +97,7 @@ public class ScenarioRun implements Runnable {
sealAllAttributes
();
// Run simulation main loop from start time = 0 seconds
simulation
=
new
Simulation
(
mainModel
,
0
,
scenarioStore
.
n
ame
,
scenarioStore
,
passiveCallbacks
,
random
,
processorManager
);
simulation
=
new
Simulation
(
mainModel
,
0
,
scenarioStore
.
getN
ame
()
,
scenarioStore
,
passiveCallbacks
,
random
,
processorManager
);
}
simulation
.
run
();
...
...
@@ -165,8 +165,8 @@ public class ScenarioRun implements Runnable {
}
public
String
readyToRunResponse
()
{
// TODO [priority=medium] [task=check] add more conditions
if
(
scenarioStore
.
m
ainModel
==
null
)
{
return
scenarioStore
.
n
ame
+
": no mainModel is set"
;
if
(
scenarioStore
.
getM
ainModel
()
==
null
)
{
return
scenarioStore
.
getN
ame
()
+
": no mainModel is set"
;
}
return
null
;
}
...
...
VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java
View file @
941c94cd
...
...
@@ -3,6 +3,7 @@ package org.vadere.simulator.projects;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.function.Predicate
;
import
org.apache.commons.codec.digest.DigestUtils
;
import
org.apache.log4j.LogManager
;
...
...
@@ -28,11 +29,11 @@ import com.fasterxml.jackson.core.JsonProcessingException;
public
class
ScenarioStore
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
ScenarioStore
.
class
);
p
ublic
String
name
;
p
ublic
String
description
;
p
ublic
String
mainModel
;
p
ublic
List
<
Attributes
>
attributesList
;
p
ublic
AttributesSimulation
attributesSimulation
;
p
rivate
String
name
;
p
rivate
String
description
;
p
rivate
String
mainModel
;
p
rivate
List
<
Attributes
>
attributesList
;
p
rivate
AttributesSimulation
attributesSimulation
;
private
Topography
topography
;
public
ScenarioStore
(
final
String
name
,
final
String
description
,
final
String
mainModel
,
final
List
<
Attributes
>
attributesModel
,
...
...
@@ -85,4 +86,52 @@ public class ScenarioStore {
public
<
T
extends
Attributes
>
T
getAttributes
(
@NotNull
final
Class
<
T
>
clazz
)
{
return
FindByClass
.
findSingleObjectOfClass
(
attributesList
,
clazz
);
}
public
void
setAttributesList
(
final
List
<
Attributes
>
attributesList
)
{
this
.
attributesList
=
attributesList
;
}
public
void
setAttributesSimulation
(
final
AttributesSimulation
attributesSimulation
)
{
this
.
attributesSimulation
=
attributesSimulation
;
}
public
void
removeAttributesIf
(
@NotNull
final
Predicate
<
Attributes
>
predicate
)
{
attributesList
.
removeIf
(
predicate
);
}
public
void
addAttributes
(
@NotNull
final
Attributes
attributes
)
{
attributesList
.
add
(
attributes
);
}
public
void
setDescription
(
final
String
description
)
{
this
.
description
=
description
;
}
public
void
setMainModel
(
final
String
mainModel
)
{
this
.
mainModel
=
mainModel
;
}
public
void
setName
(
final
String
name
)
{
this
.
name
=
name
;
}
public
AttributesSimulation
getAttributesSimulation
()
{
return
attributesSimulation
;
}
public
List
<
Attributes
>
getAttributesList
()
{
return
attributesList
;
}
public
String
getDescription
()
{
return
description
;
}
public
String
getMainModel
()
{
return
mainModel
;
}
public
String
getName
()
{
return
name
;
}
}
VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java
View file @
941c94cd
...
...
@@ -87,8 +87,8 @@ public class JsonConverter {
}
private
static
void
serializeMeta
(
ObjectNode
node
,
boolean
commitHashIncluded
,
ScenarioStore
scenarioStore
)
{
node
.
put
(
"name"
,
scenarioStore
.
n
ame
);
node
.
put
(
"description"
,
scenarioStore
.
d
escription
);
node
.
put
(
"name"
,
scenarioStore
.
getN
ame
()
);
node
.
put
(
"description"
,
scenarioStore
.
getD
escription
()
);
node
.
put
(
"release"
,
HashGenerator
.
releaseNumber
());
if
(
commitHashIncluded
)
node
.
put
(
"commithash"
,
HashGenerator
.
commitHash
());
...
...
@@ -97,14 +97,14 @@ public class JsonConverter {
private
static
ObjectNode
serializeVadereNode
(
ScenarioStore
scenarioStore
)
{
ObjectNode
vadereNode
=
StateJsonConverter
.
createObjectNode
();
vadereNode
.
put
(
StateJsonConverter
.
MAIN_MODEL_KEY
,
scenarioStore
.
m
ainModel
);
vadereNode
.
put
(
StateJsonConverter
.
MAIN_MODEL_KEY
,
scenarioStore
.
getM
ainModel
()
);
// vadere > attributesModel
ObjectNode
attributesModelNode
=
StateJsonConverter
.
serializeAttributesModelToNode
(
scenarioStore
.
a
ttributesList
);
ObjectNode
attributesModelNode
=
StateJsonConverter
.
serializeAttributesModelToNode
(
scenarioStore
.
getA
ttributesList
()
);
vadereNode
.
set
(
"attributesModel"
,
attributesModelNode
);
// vadere > attributesSimulation
vadereNode
.
set
(
"attributesSimulation"
,
StateJsonConverter
.
convertValue
(
scenarioStore
.
a
ttributesSimulation
,
JsonNode
.
class
));
vadereNode
.
set
(
"attributesSimulation"
,
StateJsonConverter
.
convertValue
(
scenarioStore
.
getA
ttributesSimulation
()
,
JsonNode
.
class
));
// vadere > topography
ObjectNode
topographyNode
=
StateJsonConverter
.
serializeTopographyToNode
(
scenarioStore
.
getTopography
());
...
...
@@ -119,10 +119,10 @@ public class JsonConverter {
}
public
static
ScenarioStore
cloneScenarioStore
(
ScenarioStore
scenarioStore
)
throws
IOException
{
JsonNode
attributesSimulationNode
=
StateJsonConverter
.
convertValue
(
scenarioStore
.
a
ttributesSimulation
,
JsonNode
.
class
);
ObjectNode
attributesModelNode
=
StateJsonConverter
.
serializeAttributesModelToNode
(
scenarioStore
.
a
ttributesList
);
JsonNode
attributesSimulationNode
=
StateJsonConverter
.
convertValue
(
scenarioStore
.
getA
ttributesSimulation
()
,
JsonNode
.
class
);
ObjectNode
attributesModelNode
=
StateJsonConverter
.
serializeAttributesModelToNode
(
scenarioStore
.
getA
ttributesList
()
);
ObjectNode
topographyNode
=
StateJsonConverter
.
serializeTopographyToNode
(
scenarioStore
.
getTopography
());
return
new
ScenarioStore
(
scenarioStore
.
n
ame
,
scenarioStore
.
d
escription
,
scenarioStore
.
m
ainModel
,
return
new
ScenarioStore
(
scenarioStore
.
getN
ame
()
,
scenarioStore
.
getD
escription
()
,
scenarioStore
.
getM
ainModel
()
,
StateJsonConverter
.
deserializeAttributesListFromNode
(
attributesModelNode
),
StateJsonConverter
.
deserializeAttributesSimulationFromNode
(
attributesSimulationNode
),
StateJsonConverter
.
deserializeTopographyFromNode
(
topographyNode
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment