From b75260ab0048c41d8ead5ac8b79daea5cb85160f Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Mon, 22 Jan 2018 19:24:14 +0100
Subject: [PATCH] Code Quality: drop redundant if-statement conditions #546

---
 .paket/Paket.Restore.targets                | 6 +++++-
 src/Numerics/SpecialFunctions/Erf.cs        | 4 ++--
 src/Numerics/Statistics/MovingStatistics.cs | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index a86be3a1..830e5699 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -23,6 +23,9 @@
     <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
     <PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
 
+    <!-- no extension is a shell script -->
+    <PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>
+
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
@@ -145,9 +148,10 @@
       </DotNetCliToolReference>
     </ItemGroup>
 
+    <!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
     <PropertyGroup>
       <RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
-    </PropertyGroup>
+    </PropertyGroup> -->
 
   </Target>
 
diff --git a/src/Numerics/SpecialFunctions/Erf.cs b/src/Numerics/SpecialFunctions/Erf.cs
index 6f2fb972..30194f59 100644
--- a/src/Numerics/SpecialFunctions/Erf.cs
+++ b/src/Numerics/SpecialFunctions/Erf.cs
@@ -421,7 +421,7 @@ namespace MathNet.Numerics
                     result = (z*1.125) + (z*Evaluate.Polynomial(z, ErfImpAn)/Evaluate.Polynomial(z, ErfImpAd));
                 }
             }
-            else if ((z < 110) || ((z < 110) && invert))
+            else if (z < 110)
             {
                 // We'll be calculating erfc:
                 invert = !invert;
@@ -488,7 +488,7 @@ namespace MathNet.Numerics
                 }
                 else if (z < 60)
                 {
-                    // Worst case absolute error found: 5.896543869e-24 
+                    // Worst case absolute error found: 5.896543869e-24
                     r = Evaluate.Polynomial(z - 38, ErfImpLn) /Evaluate.Polynomial(z - 38, ErfImpLd);
                     b = 0.5640528202F;
                 }
diff --git a/src/Numerics/Statistics/MovingStatistics.cs b/src/Numerics/Statistics/MovingStatistics.cs
index 4e05ce70..dc920f0b 100644
--- a/src/Numerics/Statistics/MovingStatistics.cs
+++ b/src/Numerics/Statistics/MovingStatistics.cs
@@ -162,7 +162,7 @@ namespace MathNet.Numerics.Statistics
         {
             get
             {
-                if (_lastNaNTimeToLive > 0 || _lastNegInfTimeToLive > 0 || (_lastPosInfTimeToLive > 0 && _lastNegInfTimeToLive > 0))
+                if (_lastNaNTimeToLive > 0 || _lastNegInfTimeToLive > 0)
                 {
                     return double.NaN;
                 }
@@ -185,7 +185,7 @@ namespace MathNet.Numerics.Statistics
         {
             get
             {
-                if (_lastNaNTimeToLive > 0 || _lastNegInfTimeToLive > 0 || (_lastPosInfTimeToLive > 0 && _lastNegInfTimeToLive > 0))
+                if (_lastNaNTimeToLive > 0 || _lastNegInfTimeToLive > 0)
                 {
                     return double.NaN;
                 }
@@ -208,7 +208,7 @@ namespace MathNet.Numerics.Statistics
         {
             get
             {
-                if (_lastNaNTimeToLive > 0 || _lastNegInfTimeToLive > 0 || (_lastPosInfTimeToLive > 0 && _lastNegInfTimeToLive > 0))
+                if (_lastNaNTimeToLive > 0 || _lastNegInfTimeToLive > 0)
                 {
                     return double.NaN;
                 }
@@ -231,7 +231,7 @@ namespace MathNet.Numerics.Statistics
         {
             get
             {
-                if (_lastNaNTimeToLive > 0 || _lastNegInfTimeToLive > 0 || (_lastPosInfTimeToLive > 0 && _lastNegInfTimeToLive > 0))
+                if (_lastNaNTimeToLive > 0 || _lastNegInfTimeToLive > 0)
                 {
                     return double.NaN;
                 }