Restore integration tests with numeric tolerance

src/test/java/simpaths/integrationtest/RunSimPathsIntegrationTest.java

@@ -17,6 +17,11 @@
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class RunSimPathsIntegrationTest {
+    /** Absolute epsilon for numeric comparison. */
+    private static final double ABS_EPSILON = 1e-9;
+    /** Relative epsilon for numeric comparison. */
+    private static final double REL_EPSILON = 1e-6;
+
     @Test
     @DisplayName("Initial database setup runs successfully")
     @Order(1)
@@ -185,7 +190,20 @@ private boolean tokensMatchWithTolerance(String expectedToken, String actualToke
         Double actualNumber = tryParseDouble(actualTrimmed);
 
         if (expectedNumber != null && actualNumber != null) {
-            return true;
+            double e = expectedNumber;
+            double a = actualNumber;
+            if (Double.isNaN(e) && Double.isNaN(a)) {
+                return true;
+            }
+            if (Double.isNaN(e) || Double.isNaN(a)) {
+                return false;
+            }
+            if (Double.isInfinite(e) || Double.isInfinite(a)) {
+                return Double.compare(e, a) == 0;
+            }
+            double diff = Math.abs(e - a);
+            double tolerance = Math.max(ABS_EPSILON, REL_EPSILON * Math.max(Math.abs(e), Math.abs(a)));
+            return diff <= tolerance;
         }
 
         return expectedToken.equals(actualToken);

src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv

@@ -1,9 +1,9 @@
 run,time,id_AlignmentAdjustmentFactors1,empShareSimACFemales,empShareSimACMales,empShareSimCouples,empShareSimSingleDepFemales,empShareSimSingleDepMales,empShareSimSingleFemales,empShareSimSingleMales,empShareTgtACFemales,empShareTgtACMales,empShareTgtCouples,empShareTgtSingleDepFemales,empShareTgtSingleDepMales,empShareTgtSingleFemales,empShareTgtSingleMales,fertilityAdjFactor,fertilityRateSim,fertilityRateTgt,inSchoolAdjFactor,inSchoolShareSim,inSchoolShareTgt,partnershipAdjFactor,shareCohabitingSim,shareCohabitingTgt,utilityAdjACFemales,utilityAdjACMales,utilityAdjCouples,utilityAdjSingleDepFemales,utilityAdjSingleDepMales,utilityAdjSingleFemales,utilityAdjSingleMales
 1,2019.0,1,0.5623931623931624,0.5619047619047619,0.8590878148400273,0.3333333333333333,0.44308943089430897,0.43822697265011,0.5445244410761653,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.46535641588110904,0.44388496690103335,0.4705375056413739,-0.279462622342386,0.05029585798816568,0.05113363440615968,0.0,0.281711358843025,0.3023858368396759,-0.613869665517935,0.5387792565396972,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-1,2020.0,1,0.45109780439121755,0.5709090909090909,0.9006958538706872,0.45714285714285713,0.4841628959276018,0.33030646992054485,0.4274735830931796,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.46203656399953613,0.44281420563924695,0.4648045911203806,-0.2659197918000082,0.04835164835164835,0.04996578478889472,0.0,0.28065967016491755,0.2760101854801178,1.594846751573303,0.6270179516983081,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-1,2021.0,1,0.5,0.5580204778156996,0.9200058927519151,0.4869281045751634,0.4924812030075188,0.3886292834890966,0.4849699398797595,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.39809788164553633,0.46415923362147143,0.4451259300414946,0.4776386065456221,-0.25543875103684177,0.04774931609052475,0.04833442666835588,0.0,0.29580911593759557,0.27926552295684814,0.5242473079548589,0.632084035793023,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-1,2022.0,1,0.5407166123778502,0.5965417867435159,0.9326554671382258,0.49188311688311687,0.5,0.42600224803297115,0.5153256704980843,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.45305412911862847,0.5097880138188646,-0.24930347300809638,0.04783875667799903,0.04938041570024613,0.0,0.27308507417499245,0.26489490270614624,-0.19554831088284996,0.614504544587809,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+1,2020.0,1,0.4572025052192067,0.5439252336448598,0.9011560693641618,0.4639175257731959,0.4928571428571429,0.3284644194756554,0.42614440773949974,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.46203656399953613,0.44281420563924695,0.4648045911203806,-0.2659197918000082,0.04826913700633837,0.04996578478889472,0.0,0.29220583809810413,0.2760101854801178,1.5824384150734823,0.6261676222379695,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+1,2021.0,1,0.4908722109533469,0.5415162454873647,0.9236131280859715,0.4889589905362776,0.5,0.39237581825182904,0.47211350293542076,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.39809788164553633,0.46415923362147143,0.4451259300414946,0.4776386065456221,-0.25543875103684177,0.04734895191122072,0.04833442666835588,0.0,0.31303030303030305,0.27926552295684814,0.6108032645394403,0.6330322580645161,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+1,2022.0,1,0.4772344013490725,0.5787037037037037,0.9318777292576419,0.4968051118210863,0.49166666666666664,0.4214630523579651,0.4913023037141514,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.45305412911862847,0.5097880138188646,-0.24930347300809638,0.047469879518072286,0.04938041570024613,0.0,0.3028588445503276,0.26489490270614624,-0.08224154272219575,0.6154919748778785,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 2,2019.0,1,0.5623931623931624,0.5625990491283677,0.8589656345695815,0.3341584158415842,0.4426229508196721,0.44052863436123346,0.5452823039029936,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.46535641588110904,0.44388496690103335,0.4705375056413739,-0.279462622342386,0.05025868440502587,0.05113363440615968,0.0,0.28154170430593195,0.3023858368396759,-0.613869665517935,0.5392124746118063,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2,2020.0,1,0.4838709677419355,0.5262206148282098,0.8990526939017169,0.4548611111111111,0.49130434782608695,0.32677016281711474,0.41590800191662675,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.46203656399953613,0.44281420563924695,0.4648045911203806,-0.2659197918000082,0.04886475814412636,0.04996578478889472,0.0,0.283987915407855,0.2760101854801178,1.6228208239181277,0.6251378885211861,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2,2021.0,1,0.51,0.5457685664939551,0.9157973174366617,0.49032258064516127,0.49809160305343514,0.3954562957258375,0.47687717553455994,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.39809788164553633,0.46415923362147143,0.4451259300414946,0.4776386065456221,-0.25543875103684177,0.047988002999250184,0.04833442666835588,0.0,0.2883906633906634,0.27926552295684814,0.5919873916392584,0.6303542411439714,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2,2022.0,1,0.5454545454545454,0.5729166666666666,0.9277628835269586,0.49226006191950467,0.5,0.4234034699150978,0.49310508796956726,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.45305412911862847,0.5097880138188646,-0.24930347300809638,0.047920214059839455,0.04938041570024613,0.0,0.28468251579897685,0.26489490270614624,0.008759262125167755,0.6138374387371905,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+2,2020.0,1,0.4978813559322034,0.515828677839851,0.8992361927144535,0.4641638225255973,0.4933920704845815,0.32093198045847426,0.4190655969797074,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.46203656399953613,0.44281420563924695,0.4648045911203806,-0.2659197918000082,0.048672566371681415,0.04996578478889472,0.0,0.29518619436875565,0.2760101854801178,1.6128880808812671,0.6256224535989136,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+2,2021.0,1,0.522633744855967,0.5334538878842676,0.9188473978241694,0.49050632911392406,0.5,0.3835774865073246,0.4631992149165849,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.39809788164553633,0.46415923362147143,0.4451259300414946,0.4776386065456221,-0.25543875103684177,0.05064870259481038,0.04833442666835588,0.0,0.30357688780189546,0.27926552295684814,0.6260778621212384,0.6321115796302303,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+2,2022.0,1,0.4809688581314879,0.5720930232558139,0.9282768777614139,0.495253164556962,0.492156862745098,0.42316176470588235,0.4920856610800745,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.45305412911862847,0.5097880138188646,-0.24930347300809638,0.04760753987433543,0.04938041570024613,0.0,0.3075771188978736,0.26489490270614624,-0.030286161899442665,0.6137847948766724,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0

src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv

@@ -1,9 +1,9 @@
 run,time,id_EmploymentStatistics1,labEmpShare,labEmpToNotEmpShare,labNotEmpToEmpShare,labUnempShare
 1,2019.0,1,0.712445288628293,0.0,0.0,0.15533900404657694
-1,2020.0,1,0.7198201879852881,0.07584807844021188,0.40958832725377803,0.15243154883530854
-1,2021.0,1,0.7541834968263128,0.019022962629446194,0.39167556029882605,0.10963646855164455
-1,2022.0,1,0.7732375030283453,0.0258098223615465,0.3328488372093023,0.10078333198740208
+1,2020.0,1,0.7192882213696841,0.07632730946234145,0.4062992125984252,0.15141621092155744
+1,2021.0,1,0.7567169069462647,0.016856441169903997,0.3763955342902711,0.10468545216251639
+1,2022.0,1,0.7671254930371086,0.024914356898162567,0.29037149355572406,0.09820494244546406
 2,2019.0,1,0.7128238983330583,0.0,0.0,0.15514111239478462
-2,2020.0,1,0.7117235705471,0.0796871457719338,0.39155672823218995,0.15746606334841629
-2,2021.0,1,0.75,0.017728468489076978,0.37833675564681724,0.11656187954996691
-2,2022.0,1,0.7631877022653721,0.024775962045334738,0.3002754820936639,0.10582524271844661
+2,2020.0,1,0.712516404199475,0.07951725693661177,0.38656795346377576,0.15616797900262466
+2,2021.0,1,0.7503300330033004,0.018074343526202113,0.36666666666666664,0.1117986798679868
+2,2022.0,1,0.7626559356136821,0.02367235780873573,0.29466192170818506,0.09995975855130784