Remove experiment file, set driver lang to c++17, fix by component last mouse move

4 files changed, 3 insertions, 63 deletions

diff --git a/common/accel-experimentone.hpp b/common/accel-experimentone.hpp
deleted file mode 100644
index 7d21b58..0000000
--- a/common/accel-experimentone.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <math.h>
-
-#include "accel-base.hpp"
-
-namespace rawaccel {
-
-	/// <summary> Struct to hold sigmoid (s-shaped) gain implementation. </summary>
-	struct experimentone_impl {
-		double rate;
-		double limit;
-		double midpoint;
-		double subtractive_constant;
-
-		experimentone_impl(const accel_args& args) :
-			rate(pow(10,args.rate)), limit(2*log10(args.limit)), midpoint(log10(args.midpoint))
-		{
-			subtractive_constant = limit / 2;
-		}
-
-		inline double operator()(double speed) const {
-			double log_speed = log10(speed);
-			return pow(10, limit / (exp(-rate * (log_speed - midpoint)) + 1) - subtractive_constant);
-
-		}
-
-		inline double legacy_offset(double speed) const { return operator()(speed); }
-	};
-
-	using accel_experimentone = nonadditive_accel<experimentone_impl>;
-
-}
diff --git a/common/common.vcxitems b/common/common.vcxitems
index f8cbf28..1eabfd7 100644
--- a/common/common.vcxitems
+++ b/common/common.vcxitems
@@ -16,7 +16,6 @@
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-base.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-classic.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)accel-experimentone.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-motivity.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-linear.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-natural.hpp" />
diff --git a/driver/driver.vcxproj b/driver/driver.vcxproj
index bee36c4..7df16a0 100644
--- a/driver/driver.vcxproj
+++ b/driver/driver.vcxproj
@@ -66,7 +66,7 @@
       <WarningLevel>Level4</WarningLevel>
       <ExceptionHandling>
       </ExceptionHandling>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories);$(SolutionDir)\external;$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
       <RuntimeLibrary>
       </RuntimeLibrary>
diff --git a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
index 22181ad..d107f87 100644
--- a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
+++ b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
@@ -6,8 +6,6 @@ namespace grapher.Models.Charts.ChartState
 {
     public class XYTwoGraphState : ChartState
     {
-        private DriverSettings _settings;
-
         public XYTwoGraphState(
             ChartXY sensitivityChart,
             ChartXY velocityChart,
@@ -22,23 +20,7 @@ namespace grapher.Models.Charts.ChartState
                   accelCalculator)
         { }
 
-        public override DriverSettings Settings
-        {
-            get { return _settings; }
-            set
-            {
-                _settings = value;
-                ShouldStripSens = AccelCalculator.ShouldStripSens(ref value);
-                if (ShouldStripSens)
-                {
-                    Sensitivity = AccelCalculator.GetSens(ref value);
-                }
-            }
-        }
-
-        private bool ShouldStripSens { get; set; }
-
-        private (double, double) Sensitivity { get; set; }
+        public override DriverSettings Settings { get; set; }
 
         public override void Activate()
         {
@@ -53,15 +35,7 @@ namespace grapher.Models.Charts.ChartState
 
         public override void MakeDots(int x, int y, double timeInMs)
         {
-            double xCalc = x; 
-            double yCalc = y;
-
-            if (ShouldStripSens)
-            {
-                (xCalc, yCalc) = AccelCalculator.StripSens(xCalc, yCalc, Sensitivity.Item1, Sensitivity.Item2);
-            }
-
-            Data.CalculateDotsXY((int)Math.Round(xCalc), (int)Math.Round(yCalc), timeInMs);
+            Data.CalculateDotsXY(x, y, timeInMs);
         }
 
         public override void Bind()