Update rounding functions

AndresLaverdeMarin · Feb 22, 2021 · 706243f · 706243f
1 parent 454a614
commit 706243f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/gearshift/core/model/calculateShiftpointsNdvFullPC/__init__.py b/gearshift/core/model/calculateShiftpointsNdvFullPC/__init__.py
@@ -3190,7 +3190,7 @@ def generate_gears(
         "CalculatedGearsOutput": np.vstack(
             (TraceTimes[GearSequenceStarts], GearNames)
         ).T,
-        "AverageGearOutput": np.round(AverageGear * 10000) / 10000,
+        "AverageGearOutput": np.round(AverageGear, 4),
         "PowerCurveOutput": FullPowerCurve,
         "AdjustedMax95EngineSpeed": Max95EngineSpeedFinal,
         "TraceTimesOutput": TraceTimes,
@@ -3214,7 +3214,7 @@ def generate_gears(
         "ClutchUndefinedOutput": ClutchUndefinedFinal.astype(int),
         "ClutchHSTOutput": ClutchHST,
         "GearCorrectionsOutput": CorrectionsCells,
-        "ChecksumVxGearOutput": np.round(ChecksumVxGear * 10000) / 10000,
+        "ChecksumVxGearOutput": np.round(ChecksumVxGear, 4),
     }
 
     return shift_points
diff --git a/gearshift/core/model/scaleTrace/__init__.py b/gearshift/core/model/scaleTrace/__init__.py
@@ -826,14 +826,12 @@ def generate_speed_trace(
 
     speed_trace = {
         "RequiredToRatedPowerRatio": requiredToRatedPowerRatio,
-        "calculatedDownscalingFactor": np.round(
-            (calculatedDownscalingFactor * 1000)) / 1000
+        "calculatedDownscalingFactor": np.round(calculatedDownscalingFactor, 3)
         ,
-        "CalculatedDownscalingPercentage": (np.round(
-            (calculatedDownscalingFactor * 1000)) / 1000) * 100,
-        "TotalChecksum": np.round(np.sum(originalVehicleSpeeds) * 10) / 10,
+        "CalculatedDownscalingPercentage": (np.round(calculatedDownscalingFactor, 3)) * 100,
+        "TotalChecksum": np.round(np.sum(originalVehicleSpeeds), 1),
         "MaxVehicleSpeed": format(np.max(compensatedVehicleSpeeds), '.1f'),
-        "TotalDistance": np.round(np.sum(compensatedVehicleSpeeds / 3.6) * 10) / 10,
+        "TotalDistance": np.round(np.sum(compensatedVehicleSpeeds / 3.6), 1),
         "DistanceCompensatedPhaseLengths": np.add(
             PhaseLengths, additionalSamples
         ).astype(int),