1 files changed, 26 insertions, 5 deletions
diff --git a/grapher/Models/Calculations/AccelChartData.cs b/grapher/Models/Calculations/AccelChartData.cs
index a3354aa..fa31f35 100644
--- a/grapher/Models/Calculations/AccelChartData.cs
+++ b/grapher/Models/Calculations/AccelChartData.cs
@@ -13,6 +13,8 @@ namespace grapher.Models.Calculations
             AccelPoints = new SortedDictionary<double, double>();
             VelocityPoints = new SortedDictionary<double, double>();
             GainPoints = new SortedDictionary<double, double>();
+            OrderedVelocityPointsList = new List<double>();
+            OutVelocityToPoints = new Dictionary<double, (double, double, double)>();
         }
 
         public SortedDictionary<double, double> AccelPoints { get; }
@@ -21,23 +23,42 @@ namespace grapher.Models.Calculations
 
         public SortedDictionary<double, double> GainPoints { get; }
 
+        public List<double> OrderedVelocityPointsList { get; }
+
+        public Dictionary<double, (double, double, double)> OutVelocityToPoints { get; }
+
         public void Clear()
         {
             AccelPoints.Clear();
             VelocityPoints.Clear();
             GainPoints.Clear();
+            OrderedVelocityPointsList.Clear();
+            OutVelocityToPoints.Clear();
         }
 
         public (double, double, double) FindInValuesFromOut(double outVelocityValue)
         {
-            var velIdx = ~VelocityPoints.Values.ToList().BinarySearch(outVelocityValue);
-
-            if (velIdx < 0)
+            if (OutVelocityToPoints.TryGetValue(outVelocityValue, out var values))
             {
-                velIdx = ~velIdx;
+                return values;
             }
+            else
+            {
+                var velIdx = OrderedVelocityPointsList.BinarySearch(outVelocityValue);
+
+                if (velIdx < 0)
+                {
+                    velIdx = ~velIdx;
+                }
 
-            return (VelocityPoints.ElementAt(velIdx).Key, AccelPoints.ElementAt(velIdx).Value, GainPoints.ElementAt(velIdx).Value);
+                velIdx = Math.Min(velIdx, VelocityPoints.Count - 1);
+
+                values = (VelocityPoints.ElementAt(velIdx).Key, AccelPoints.ElementAt(velIdx).Value, GainPoints.ElementAt(velIdx).Value);
+
+                OutVelocityToPoints.Add(outVelocityValue, values);
+
+                return values;
+            }
         }
     }
 }