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 [r19057]  Maximize  Restore  History

code cleanup, restructuring test case to test separate things in separate threads instead of everything in one.

Authored by: mrieser 2012-04-05

Browse code at this revision

Parent: [r19056]

Child: [r19058]

changed	/contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/CadytsBuilder.java
changed	/contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/NewPtBsePlanStrategy.java
changed	/contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/PtBseCountsComparisonAlgorithm.java
added	/contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/utils
changed	/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest.java
renamed	/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/CalibrationStatReader.java -> /contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReader.java
changed	/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/CountsReader.java
added	/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/utils
added	/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReaderTest.java
removed	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration
copied	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/4plans.xml -> /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/4plans.xml
copied	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/counts -> /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/counts
copied	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/equil_config.xml -> /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/equil_config.xml
copied	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/input_calibration-stats.txt -> /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReaderTest/testReader/calibration-stats.txt
copied	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/network.xml -> /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/network.xml
copied	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/transitSchedule1bus.xml -> /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/transitSchedule1bus.xml
copied	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/vehicles.xml -> /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/vehicles.xml
added	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/utils
added	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReaderTest
added	/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReaderTest/testReader

/contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/CadytsBuilder.java Diff Switch to side-by-side view

/contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/NewPtBsePlanStrategy.java Diff Switch to side-by-side view

/contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/PtBseCountsComparisonAlgorithm.java Diff Switch to side-by-side view

/contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/utils

Directory.

/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest.java Diff Switch to side-by-side view

/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/CalibrationStatReader.java to /contrib/trunk/cadytsIntegration/src/main/java/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReader.java

File was renamed.

/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/CountsReader.java Diff Switch to side-by-side view

/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/utils

Directory.

/contrib/trunk/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReaderTest.java Diff Switch to side-by-side view

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration

File was removed.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/4plans.xml to /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/4plans.xml

File was copied.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/counts to /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/counts

File was copied.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/equil_config.xml to /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/equil_config.xml

File was copied.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/input_calibration-stats.txt to /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReaderTest/testReader/calibration-stats.txt

File was copied.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/network.xml to /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/network.xml

File was copied.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/transitSchedule1bus.xml to /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/transitSchedule1bus.xml

File was copied.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/testCalibration/vehicles.xml to /contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/CadytsIntegrationTest/vehicles.xml

File was copied.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/utils

Directory.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReaderTest

Directory.

/contrib/trunk/cadytsIntegration/src/test/resources/test/input/org/matsim/contrib/cadyts/pt/utils/CalibrationStatReaderTest/testReader

Directory.