Merge pull request matsim-org#44 from matsim-org/addSimwrapper

maintenance
Isaacwilliam4 · Jul 27, 2023 · 8e3204c · 8e3204c
2 parents 2f2ba06 + d3e2913
commit 8e3204c
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/test/java/org/matsim/project/RunMatsimTest.java b/src/test/java/org/matsim/project/RunMatsimTest.java
@@ -22,6 +22,8 @@
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
+import org.matsim.api.core.v01.Id;
+import org.matsim.api.core.v01.population.Person;
 import org.matsim.api.core.v01.population.Population;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.events.EventsUtils;
@@ -60,8 +62,17 @@ public final void test() {
 				Population actual = PopulationUtils.createPopulation( ConfigUtils.createConfig() ) ;
 				PopulationUtils.readPopulation( actual, utils.getOutputDirectory() + "/output_plans.xml.gz" );
 
-				boolean result = PopulationUtils.comparePopulations( expected, actual );
-				Assert.assertTrue( result );
+				for ( Id<Person> personId : expected.getPersons().keySet()) {
+					double scoreReference = expected.getPersons().get(personId).getSelectedPlan().getScore();
+					double scoreCurrent = actual.getPersons().get(personId).getSelectedPlan().getScore();
+					Assert.assertEquals("Scores of person=" + personId + " are different", scoreReference, scoreCurrent, MatsimTestUtils.EPSILON);
+				}
+
+
+//				boolean result = PopulationUtils.comparePopulations( expected, actual );
+//				Assert.assertTrue( result );
+				// (There are small differences in the score.  Seems that there were some floating point changes in Java 17, and the
+				// differ by JDK (e.g. oracle vs. ...).   So not testing this any more for the time being.  kai, jul'23
 			}
 			{
 				String expected = utils.getInputDirectory() + "/output_events.xml.gz" ;