Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
4bd57b11
Commit
4bd57b11
authored
May 14, 2019
by
Daniel Lehmberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
included a requireRectangular flag, which removes duplicated checks
parent
00993518
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
29 additions
and
57 deletions
+29
-57
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/ProcessorManager.java
...e/simulator/projects/dataprocessing/ProcessorManager.java
+13
-2
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDataProcessor.java
.../projects/dataprocessing/processor/AreaDataProcessor.java
+1
-6
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiProcessor.java
...dataprocessing/processor/AreaDensityVoronoiProcessor.java
+1
-8
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramBProcessor.java
...ataprocessing/processor/FundamentalDiagramBProcessor.java
+1
-5
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramCProcessor.java
...ataprocessing/processor/FundamentalDiagramCProcessor.java
+2
-5
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramDProcessor.java
...ataprocessing/processor/FundamentalDiagramDProcessor.java
+2
-6
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramEProcessor.java
...ataprocessing/processor/FundamentalDiagramEProcessor.java
+2
-6
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianCrossingTimeProcessor.java
...processing/processor/PedestrianCrossingTimeProcessor.java
+1
-5
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingEndTimeProcessor.java
...ocessing/processor/PedestrianWaitingEndTimeProcessor.java
+1
-5
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingTimeProcessor.java
...aprocessing/processor/PedestrianWaitingTimeProcessor.java
+1
-5
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiProcessorTestEnv.java
...cessing/processor/AreaDensityVoronoiProcessorTestEnv.java
+1
-1
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaSpeedProcessorTestEnv.java
...s/dataprocessing/processor/AreaSpeedProcessorTestEnv.java
+1
-1
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingEndTimeProcessorTestEnv.java
...g/processor/PedestrianWaitingEndTimeProcessorTestEnv.java
+1
-1
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingTimeProcessorTestEnv.java
...sing/processor/PedestrianWaitingTimeProcessorTestEnv.java
+1
-1
No files found.
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/ProcessorManager.java
View file @
4bd57b11
...
@@ -54,8 +54,19 @@ public class ProcessorManager {
...
@@ -54,8 +54,19 @@ public class ProcessorManager {
return
this
.
processorMap
.
getOrDefault
(
id
,
null
);
return
this
.
processorMap
.
getOrDefault
(
id
,
null
);
}
}
public
MeasurementArea
getMeasurementArea
(
int
measurementAreaId
){
public
MeasurementArea
getMeasurementArea
(
int
measurementAreaId
,
boolean
requireRectangular
){
return
topography
.
getMeasurementArea
(
measurementAreaId
);
MeasurementArea
measurementArea
=
topography
.
getMeasurementArea
(
measurementAreaId
);
if
(
measurementArea
==
null
){
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
measurementAreaId
));
}
if
(
requireRectangular
&&
!
measurementArea
.
isRectangular
())
{
throw
new
RuntimeException
(
"DataProcessor only supports Rectangular measurement areas."
);
}
return
measurementArea
;
}
}
public
MainModel
getMainModel
()
{
public
MainModel
getMainModel
()
{
...
...
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDataProcessor.java
View file @
4bd57b11
...
@@ -22,12 +22,7 @@ public abstract class AreaDataProcessor<V> extends DataProcessor<TimestepKey, V>
...
@@ -22,12 +22,7 @@ public abstract class AreaDataProcessor<V> extends DataProcessor<TimestepKey, V>
public
void
init
(
final
ProcessorManager
manager
)
{
public
void
init
(
final
ProcessorManager
manager
)
{
super
.
init
(
manager
);
super
.
init
(
manager
);
AttributesAreaProcessor
att
=
(
AttributesAreaProcessor
)
this
.
getAttributes
();
AttributesAreaProcessor
att
=
(
AttributesAreaProcessor
)
this
.
getAttributes
();
this
.
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
());
this
.
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
(),
false
);
if
(
measurementArea
==
null
)
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
att
.
getMeasurementAreaId
()));
if
(!
measurementArea
.
isRectangular
())
throw
new
RuntimeException
(
"DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas."
);
}
}
public
MeasurementArea
getMeasurementArea
()
{
public
MeasurementArea
getMeasurementArea
()
{
...
...
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiProcessor.java
View file @
4bd57b11
...
@@ -7,9 +7,6 @@ import org.vadere.state.attributes.processor.AttributesProcessor;
...
@@ -7,9 +7,6 @@ import org.vadere.state.attributes.processor.AttributesProcessor;
import
org.vadere.annotation.factories.dataprocessors.DataProcessorClass
;
import
org.vadere.annotation.factories.dataprocessors.DataProcessorClass
;
import
org.vadere.state.scenario.MeasurementArea
;
import
org.vadere.state.scenario.MeasurementArea
;
import
org.vadere.util.factory.processors.Flag
;
import
java.util.List
;
/**
/**
* @author Mario Teixeira Parente
* @author Mario Teixeira Parente
...
@@ -28,11 +25,7 @@ public class AreaDensityVoronoiProcessor extends AreaDensityProcessor implements
...
@@ -28,11 +25,7 @@ public class AreaDensityVoronoiProcessor extends AreaDensityProcessor implements
super
.
init
(
manager
);
super
.
init
(
manager
);
AttributesAreaDensityVoronoiProcessor
att
=
(
AttributesAreaDensityVoronoiProcessor
)
this
.
getAttributes
();
AttributesAreaDensityVoronoiProcessor
att
=
(
AttributesAreaDensityVoronoiProcessor
)
this
.
getAttributes
();
MeasurementArea
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
());
MeasurementArea
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
(),
true
);
if
(
measurementArea
==
null
)
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
att
.
getMeasurementAreaId
()));
if
(!
measurementArea
.
isRectangular
())
throw
new
RuntimeException
(
"DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas."
);
this
.
setAlgorithm
(
new
AreaDensityVoronoiAlgorithm
(
this
.
getMeasurementArea
(),
measurementArea
));
this
.
setAlgorithm
(
new
AreaDensityVoronoiAlgorithm
(
this
.
getMeasurementArea
(),
measurementArea
));
}
}
...
...
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramBProcessor.java
View file @
4bd57b11
...
@@ -53,11 +53,7 @@ public class FundamentalDiagramBProcessor extends DataProcessor<PedestrianIdKey,
...
@@ -53,11 +53,7 @@ public class FundamentalDiagramBProcessor extends DataProcessor<PedestrianIdKey,
super
.
init
(
manager
);
super
.
init
(
manager
);
AttributesFundamentalDiagramBProcessor
att
=
(
AttributesFundamentalDiagramBProcessor
)
this
.
getAttributes
();
AttributesFundamentalDiagramBProcessor
att
=
(
AttributesFundamentalDiagramBProcessor
)
this
.
getAttributes
();
pedestrianTrajectoryProcessor
=
(
PedestrianTrajectoryProcessor
)
manager
.
getProcessor
(
att
.
getPedestrianTrajectoryProcessorId
());
pedestrianTrajectoryProcessor
=
(
PedestrianTrajectoryProcessor
)
manager
.
getProcessor
(
att
.
getPedestrianTrajectoryProcessorId
());
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
());
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
(),
false
);
if
(
measurementArea
==
null
)
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
att
.
getMeasurementAreaId
()));
if
(!
measurementArea
.
isRectangular
())
throw
new
RuntimeException
(
"DataProcessor only supports Rectangular measurement areas."
);
measurementAreaVRec
=
measurementArea
.
asVRectangle
();
measurementAreaVRec
=
measurementArea
.
asVRectangle
();
}
}
...
...
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramCProcessor.java
View file @
4bd57b11
...
@@ -42,13 +42,10 @@ public class FundamentalDiagramCProcessor extends AreaDataProcessor<Pair<Double,
...
@@ -42,13 +42,10 @@ public class FundamentalDiagramCProcessor extends AreaDataProcessor<Pair<Double,
@Override
@Override
public
void
init
(
final
ProcessorManager
manager
)
{
public
void
init
(
final
ProcessorManager
manager
)
{
super
.
init
(
manager
);
super
.
init
(
manager
);
AttributesFundamentalDiagramCProcessor
att
=
(
AttributesFundamentalDiagramCProcessor
)
this
.
getAttributes
();
AttributesFundamentalDiagramCProcessor
att
=
(
AttributesFundamentalDiagramCProcessor
)
this
.
getAttributes
();
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
());
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
()
,
true
);
pedestrianVelocityProcessor
=
(
APedestrianVelocityProcessor
)
manager
.
getProcessor
(
att
.
getPedestrianVelocityProcessorId
());
pedestrianVelocityProcessor
=
(
APedestrianVelocityProcessor
)
manager
.
getProcessor
(
att
.
getPedestrianVelocityProcessorId
());
if
(
measurementArea
==
null
)
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
att
.
getMeasurementAreaId
()));
if
(!
measurementArea
.
isRectangular
())
throw
new
RuntimeException
(
"DataProcessor only supports Rectangular measurement areas."
);
measurementAreaVRec
=
measurementArea
.
asVRectangle
();
measurementAreaVRec
=
measurementArea
.
asVRectangle
();
}
}
...
...
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramDProcessor.java
View file @
4bd57b11
...
@@ -42,12 +42,8 @@ public class FundamentalDiagramDProcessor extends AreaDataProcessor<Pair<Double,
...
@@ -42,12 +42,8 @@ public class FundamentalDiagramDProcessor extends AreaDataProcessor<Pair<Double,
super
.
init
(
manager
);
super
.
init
(
manager
);
AttributesFundamentalDiagramDProcessor
att
=
(
AttributesFundamentalDiagramDProcessor
)
this
.
getAttributes
();
AttributesFundamentalDiagramDProcessor
att
=
(
AttributesFundamentalDiagramDProcessor
)
this
.
getAttributes
();
pedestrianVelocityProcessor
=
(
APedestrianVelocityProcessor
)
manager
.
getProcessor
(
att
.
getPedestrianVelocityProcessorId
());
pedestrianVelocityProcessor
=
(
APedestrianVelocityProcessor
)
manager
.
getProcessor
(
att
.
getPedestrianVelocityProcessorId
());
MeasurementArea
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
());
MeasurementArea
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
(),
true
);
MeasurementArea
voronoiMeasurementArea
=
manager
.
getMeasurementArea
(
att
.
getVoronoiMeasurementAreaId
());
MeasurementArea
voronoiMeasurementArea
=
manager
.
getMeasurementArea
(
att
.
getVoronoiMeasurementAreaId
(),
true
);
if
(
measurementArea
==
null
||
voronoiMeasurementArea
==
null
)
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
att
.
getMeasurementAreaId
()));
if
(!
measurementArea
.
isRectangular
()
||
!
voronoiMeasurementArea
.
isRectangular
())
throw
new
RuntimeException
(
"DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas."
);
integralVoronoiAlgorithm
=
new
IntegralVoronoiAlgorithm
(
integralVoronoiAlgorithm
=
new
IntegralVoronoiAlgorithm
(
key
->
pedestrianVelocityProcessor
.
getValue
(
key
),
key
->
pedestrianVelocityProcessor
.
getValue
(
key
),
...
...
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramEProcessor.java
View file @
4bd57b11
...
@@ -33,12 +33,8 @@ public class FundamentalDiagramEProcessor extends AreaDataProcessor<Pair<Double,
...
@@ -33,12 +33,8 @@ public class FundamentalDiagramEProcessor extends AreaDataProcessor<Pair<Double,
super
.
init
(
manager
);
super
.
init
(
manager
);
AttributesFundamentalDiagramEProcessor
att
=
(
AttributesFundamentalDiagramEProcessor
)
this
.
getAttributes
();
AttributesFundamentalDiagramEProcessor
att
=
(
AttributesFundamentalDiagramEProcessor
)
this
.
getAttributes
();
pedestrianVelocityProcessor
=
(
APedestrianVelocityProcessor
)
manager
.
getProcessor
(
att
.
getPedestrianVelocityProcessorId
());
pedestrianVelocityProcessor
=
(
APedestrianVelocityProcessor
)
manager
.
getProcessor
(
att
.
getPedestrianVelocityProcessorId
());
MeasurementArea
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
());
MeasurementArea
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
(),
true
);
MeasurementArea
voronoiMeasurementArea
=
manager
.
getMeasurementArea
(
att
.
getVoronoiMeasurementAreaId
());
MeasurementArea
voronoiMeasurementArea
=
manager
.
getMeasurementArea
(
att
.
getVoronoiMeasurementAreaId
(),
true
);
if
(
measurementArea
==
null
||
voronoiMeasurementArea
==
null
)
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
att
.
getMeasurementAreaId
()));
if
(!
measurementArea
.
isRectangular
()
||
!
voronoiMeasurementArea
.
isRectangular
())
throw
new
RuntimeException
(
"DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas."
);
sumVoronoiAlgorithm
=
new
SumVoronoiAlgorithm
(
sumVoronoiAlgorithm
=
new
SumVoronoiAlgorithm
(
key
->
pedestrianVelocityProcessor
.
getValue
(
key
),
key
->
pedestrianVelocityProcessor
.
getValue
(
key
),
...
...
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianCrossingTimeProcessor.java
View file @
4bd57b11
...
@@ -81,11 +81,7 @@ public class PedestrianCrossingTimeProcessor extends DataProcessor<PedestrianIdK
...
@@ -81,11 +81,7 @@ public class PedestrianCrossingTimeProcessor extends DataProcessor<PedestrianIdK
public
void
init
(
final
ProcessorManager
manager
)
{
public
void
init
(
final
ProcessorManager
manager
)
{
super
.
init
(
manager
);
super
.
init
(
manager
);
AttributesCrossingTimeProcessor
att
=
(
AttributesCrossingTimeProcessor
)
this
.
getAttributes
();
AttributesCrossingTimeProcessor
att
=
(
AttributesCrossingTimeProcessor
)
this
.
getAttributes
();
this
.
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
());
this
.
measurementArea
=
manager
.
getMeasurementArea
(
att
.
getMeasurementAreaId
(),
true
);
if
(
measurementArea
==
null
)
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
att
.
getMeasurementAreaId
()));
if
(!
measurementArea
.
isRectangular
())
throw
new
RuntimeException
(
"DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas."
);
measurementAreaVRec
=
measurementArea
.
asVRectangle
();
measurementAreaVRec
=
measurementArea
.
asVRectangle
();
}
}
...
...
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingEndTimeProcessor.java
View file @
4bd57b11
...
@@ -47,11 +47,7 @@ public class PedestrianWaitingEndTimeProcessor extends DataProcessor<PedestrianI
...
@@ -47,11 +47,7 @@ public class PedestrianWaitingEndTimeProcessor extends DataProcessor<PedestrianI
public
void
init
(
final
ProcessorManager
manager
)
{
public
void
init
(
final
ProcessorManager
manager
)
{
super
.
init
(
manager
);
super
.
init
(
manager
);
AttributesPedestrianWaitingEndTimeProcessor
att
=
(
AttributesPedestrianWaitingEndTimeProcessor
)
this
.
getAttributes
();
AttributesPedestrianWaitingEndTimeProcessor
att
=
(
AttributesPedestrianWaitingEndTimeProcessor
)
this
.
getAttributes
();
this
.
waitingArea
=
manager
.
getMeasurementArea
(
att
.
getWaitingAreaId
());
this
.
waitingArea
=
manager
.
getMeasurementArea
(
att
.
getWaitingAreaId
(),
true
);
if
(
waitingArea
==
null
)
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
att
.
getWaitingAreaId
()));
if
(!
waitingArea
.
isRectangular
())
throw
new
RuntimeException
(
"DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas."
);
waitingAreaVRec
=
waitingArea
.
asVRectangle
();
waitingAreaVRec
=
waitingArea
.
asVRectangle
();
}
}
...
...
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingTimeProcessor.java
View file @
4bd57b11
...
@@ -54,11 +54,7 @@ public class PedestrianWaitingTimeProcessor extends DataProcessor<PedestrianIdKe
...
@@ -54,11 +54,7 @@ public class PedestrianWaitingTimeProcessor extends DataProcessor<PedestrianIdKe
public
void
init
(
final
ProcessorManager
manager
)
{
public
void
init
(
final
ProcessorManager
manager
)
{
super
.
init
(
manager
);
super
.
init
(
manager
);
AttributesPedestrianWaitingTimeProcessor
att
=
(
AttributesPedestrianWaitingTimeProcessor
)
this
.
getAttributes
();
AttributesPedestrianWaitingTimeProcessor
att
=
(
AttributesPedestrianWaitingTimeProcessor
)
this
.
getAttributes
();
this
.
waitingArea
=
manager
.
getMeasurementArea
(
att
.
getWaitingAreaId
());
this
.
waitingArea
=
manager
.
getMeasurementArea
(
att
.
getWaitingAreaId
(),
true
);
if
(
waitingArea
==
null
)
throw
new
RuntimeException
(
String
.
format
(
"MeasurementArea with index %d does not exist."
,
att
.
getWaitingAreaId
()));
if
(!
waitingArea
.
isRectangular
())
throw
new
RuntimeException
(
"DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas."
);
waitingAreaRec
=
waitingArea
.
asVRectangle
();
waitingAreaRec
=
waitingArea
.
asVRectangle
();
this
.
lastSimTime
=
0.0
;
this
.
lastSimTime
=
0.0
;
}
}
...
...
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiProcessorTestEnv.java
View file @
4bd57b11
...
@@ -36,7 +36,7 @@ public class AreaDensityVoronoiProcessorTestEnv extends ProcessorTestEnv<Timeste
...
@@ -36,7 +36,7 @@ public class AreaDensityVoronoiProcessorTestEnv extends ProcessorTestEnv<Timeste
attr
.
setMeasurementAreaId
(
42
);
attr
.
setMeasurementAreaId
(
42
);
MeasurementArea
measurementArea
=
new
MeasurementArea
(
MeasurementArea
measurementArea
=
new
MeasurementArea
(
new
AttributesMeasurementArea
(
42
,
new
VRectangle
(
0
,
0
,
16
,
16
)));
new
AttributesMeasurementArea
(
42
,
new
VRectangle
(
0
,
0
,
16
,
16
)));
Mockito
.
when
(
manager
.
getMeasurementArea
(
42
)).
thenReturn
(
measurementArea
);
Mockito
.
when
(
manager
.
getMeasurementArea
(
42
,
true
)).
thenReturn
(
measurementArea
);
}
}
...
...
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaSpeedProcessorTestEnv.java
View file @
4bd57b11
...
@@ -40,7 +40,7 @@ public class AreaSpeedProcessorTestEnv extends ProcessorTestEnv<TimestepKey, Dou
...
@@ -40,7 +40,7 @@ public class AreaSpeedProcessorTestEnv extends ProcessorTestEnv<TimestepKey, Dou
attr
.
setMeasurementAreaId
(
99
);
attr
.
setMeasurementAreaId
(
99
);
MeasurementArea
measurementArea
=
new
MeasurementArea
(
MeasurementArea
measurementArea
=
new
MeasurementArea
(
new
AttributesMeasurementArea
(
99
,
new
VRectangle
(
0
,
0
,
4
,
5
)));
new
AttributesMeasurementArea
(
99
,
new
VRectangle
(
0
,
0
,
4
,
5
)));
Mockito
.
when
(
manager
.
getMeasurementArea
(
99
)).
thenReturn
(
measurementArea
);
Mockito
.
when
(
manager
.
getMeasurementArea
(
99
,
false
)).
thenReturn
(
measurementArea
);
}
}
@Override
@Override
...
...
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingEndTimeProcessorTestEnv.java
View file @
4bd57b11
...
@@ -26,7 +26,7 @@ public class PedestrianWaitingEndTimeProcessorTestEnv extends ProcessorTestEnv<P
...
@@ -26,7 +26,7 @@ public class PedestrianWaitingEndTimeProcessorTestEnv extends ProcessorTestEnv<P
attr
.
setWaitingAreaId
(
42
);
attr
.
setWaitingAreaId
(
42
);
MeasurementArea
measurementArea
=
new
MeasurementArea
(
MeasurementArea
measurementArea
=
new
MeasurementArea
(
new
AttributesMeasurementArea
(
42
,
new
VRectangle
(
0
,
0
,
16
,
16
)));
new
AttributesMeasurementArea
(
42
,
new
VRectangle
(
0
,
0
,
16
,
16
)));
Mockito
.
when
(
manager
.
getMeasurementArea
(
42
)).
thenReturn
(
measurementArea
);
Mockito
.
when
(
manager
.
getMeasurementArea
(
42
,
true
)).
thenReturn
(
measurementArea
);
}
}
@Override
@Override
...
...
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingTimeProcessorTestEnv.java
View file @
4bd57b11
...
@@ -32,7 +32,7 @@ public class PedestrianWaitingTimeProcessorTestEnv extends ProcessorTestEnv<Pede
...
@@ -32,7 +32,7 @@ public class PedestrianWaitingTimeProcessorTestEnv extends ProcessorTestEnv<Pede
attr
.
setWaitingAreaId
(
42
);
attr
.
setWaitingAreaId
(
42
);
MeasurementArea
measurementArea
=
new
MeasurementArea
(
MeasurementArea
measurementArea
=
new
MeasurementArea
(
new
AttributesMeasurementArea
(
42
,
new
VRectangle
(
0
,
0
,
2
,
5
)));
new
AttributesMeasurementArea
(
42
,
new
VRectangle
(
0
,
0
,
2
,
5
)));
Mockito
.
when
(
manager
.
getMeasurementArea
(
42
)).
thenReturn
(
measurementArea
);
Mockito
.
when
(
manager
.
getMeasurementArea
(
42
,
true
)).
thenReturn
(
measurementArea
);
}
}
@Override
@Override
...
...
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