From 0f4d09c84c7fd0a6b6173fd08f2ff13631bebcf2 Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Fri, 22 Feb 2013 18:42:03 +0100 Subject: [PATCH] Control: fix (invert) ParallelizeOperation rules #89 --- src/Numerics/Control.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Numerics/Control.cs b/src/Numerics/Control.cs index 7084b1e6..122c09fc 100644 --- a/src/Numerics/Control.cs +++ b/src/Numerics/Control.cs @@ -74,10 +74,10 @@ namespace MathNet.Numerics { const string name = "MathNetNumericsLAProvider"; var value = Environment.GetEnvironmentVariable(name); - switch (value != null ? value.ToUpper() : string.Empty) + switch (value != null ? value.ToUpperInvariant() : string.Empty) { case "MKL": - LinearAlgebraProvider = new MathNet.Numerics.Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider(); + LinearAlgebraProvider = new Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider(); break; default: LinearAlgebraProvider = new ManagedLinearAlgebraProvider(); @@ -193,7 +193,7 @@ namespace MathNet.Numerics /// true if the operation should be parallelized; false otherwise. public static bool ParallelizeOperation(int elements) { - return elements < ParallelizeElements || DisableParallelization || NumberOfParallelWorkerThreads < 2; + return !DisableParallelization && NumberOfParallelWorkerThreads >= 2 && elements >= ParallelizeElements; } } }