Fix cost bug

Remove the definition and using of CF_Modified_Cost
licit-lab · Mar 14, 2023 · c40b68a · c40b68a
1 parent cf824d4
commit c40b68a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,4 +56,11 @@ _deps
 # End of https://www.gitignore.io/api/c++,cmake
 
 .vscode
-build
+build
+src/Graph/Algorithms/SymuMaster.log
+src/Graph/Model/SymuMaster.log
+.idea/inspectionProfiles/profiles_settings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/symucore.iml
+.idea/vcs.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/src/Graph/Algorithms/Dijkstra.cpp b/src/Graph/Algorithms/Dijkstra.cpp
@@ -484,19 +484,19 @@ Cost Dijkstra::GetTotalPatternCost(int iSimulationInstance, Pattern* pPattern, d
             {
                 // Special case of null cost patterns (touching areas with null area costs used by SymuVia for example),
                 // we use directly the percentage as the penalized cost to avoid infinite loops when computing k-shortest paths
-                resCost.setCostValue(CF_Modified_Cost, penalysingFactor);
+                resCost.setCostValue(CF_TravelTime, penalysingFactor);
             }
             else
             {
-                resCost.setCostValue(CF_Modified_Cost, pCost->getCostValue() * (1 + penalysingFactor));
+                resCost.setCostValue(CF_TravelTime, pCost->getCostValue() * (1 + penalysingFactor));
             }
         }
-        resCost.setUsedCostFunction(CF_Modified_Cost);
+        resCost.setUsedCostFunction(CF_TravelTime);
 
         // if euclidian heuristic, add the functional class related term :
         if (m_eHeuristic == SPH_EUCLIDIAN)
         {
-            resCost.setCostValue(CF_Modified_Cost, resCost.getCostValue() + pCost->getCostValue() * m_dbAStarBeta * pPattern->getFuncClass());
+            resCost.setCostValue(CF_TravelTime, resCost.getCostValue() + pCost->getCostValue() * m_dbAStarBeta * pPattern->getFuncClass());
         }
 
         return resCost;

diff --git a/src/Utils/SymuCoreConstants.h b/src/Utils/SymuCoreConstants.h
@@ -47,7 +47,7 @@ namespace SymuCore {
     enum CostFunction     //define each possible cost function here
     {
         CF_Undefined = 0,
-        CF_Modified_Cost,
+        //CF_Modified_Cost,
         CF_Total_Cost_Sum,
         CF_DriveTime,
         CF_PassiveRideTime,