MATSim Code

Brought to you by: jwjoubert, laemmel, michaz, mrieser, and 3 others

• Summary
• Files
• Reviews
• Support
• Mailing Lists
• Code

Menu ▾ ▴

 

• Browse Commits
• Browse Files

Commit [r18434]  Maximize  Restore  History

Integration of intergreen data:

- added config parameters
- integrated Reader / Writer
- implementation of intergreen logic
- Testcase

Ambertimes are no longer activated by setting the path to the input file. Now, a boolean flag has to be set to enable this optional feature.

FromDataBuilder needs Scenario instance as argument instead of SignalData

ScenarioImpl contains SignalData if Config.scenario().isUseSignalSystems() is true.

Authored by: grether 2012-02-15

Browse code at this revision

Parent: [r18433]

Child: [r18435]

1 2 > >> (Page 1 of 2)

changed	/matsim/trunk/src/main/java/org/matsim/core/config/groups/SignalSystemsConfigGroup.java
changed	/matsim/trunk/src/main/java/org/matsim/core/scenario/ScenarioImpl.java
changed	/matsim/trunk/src/main/java/org/matsim/run/OTFVis.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/builder/FromDataBuilder.java
added	/matsim/trunk/src/main/java/org/matsim/signalsystems/builder/IntergreensLogicImpl.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/controler/DefaultSignalsControllerListener.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/SignalsData.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/SignalsDataImpl.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/SignalsScenarioLoader.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/SignalsScenarioWriter.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/ambertimes/v10/AmberTimesReader10.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/intergreens/v10/IntergreenTimesReader10.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/intergreens/v10/IntergreensForSignalSystemData.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/intergreens/v10/IntergreensForSignalSystemDataImpl.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/signalcontrol/v20/SignalControlReader20.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/signalgroups/v20/SignalGroupsReader20.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/data/signalsystems/v20/SignalSystemsReader20.java
added	/matsim/trunk/src/main/java/org/matsim/signalsystems/model/IntergreensLogic.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/model/SignalSystemImpl.java
removed	/matsim/trunk/src/main/java/org/matsim/signalsystems/model/SignalSystemsFactory.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/model/SignalSystemsManager.java
changed	/matsim/trunk/src/main/java/org/matsim/signalsystems/model/SignalSystemsManagerImpl.java
removed	/matsim/trunk/src/main/java/org/matsim/signalsystems/model/StateLogic.java
changed	/matsim/trunk/src/test/java/org/matsim/integration/invertednetworks/InvertedNetworkRoutingTest.java
changed	/matsim/trunk/src/test/java/org/matsim/integration/signalsystems/SignalSystemsIntegrationTest.java

/matsim/trunk/src/main/java/org/matsim/core/config/groups/SignalSystemsConfigGroup.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/core/scenario/ScenarioImpl.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/run/OTFVis.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/builder/FromDataBuilder.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/builder/IntergreensLogicImpl.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/controler/DefaultSignalsControllerListener.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/SignalsData.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/SignalsDataImpl.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/SignalsScenarioLoader.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/SignalsScenarioWriter.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/ambertimes/v10/AmberTimesReader10.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/intergreens/v10/IntergreenTimesReader10.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/intergreens/v10/IntergreensForSignalSystemData.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/intergreens/v10/IntergreensForSignalSystemDataImpl.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/signalcontrol/v20/SignalControlReader20.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/signalgroups/v20/SignalGroupsReader20.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/data/signalsystems/v20/SignalSystemsReader20.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/model/IntergreensLogic.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/model/SignalSystemImpl.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/model/SignalSystemsFactory.java

File was removed.

/matsim/trunk/src/main/java/org/matsim/signalsystems/model/SignalSystemsManager.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/model/SignalSystemsManagerImpl.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/signalsystems/model/StateLogic.java

File was removed.

/matsim/trunk/src/test/java/org/matsim/integration/invertednetworks/InvertedNetworkRoutingTest.java Diff Switch to side-by-side view

/matsim/trunk/src/test/java/org/matsim/integration/signalsystems/SignalSystemsIntegrationTest.java Diff Switch to side-by-side view

1 2 > >> (Page 1 of 2)