Changeset 16016 for branches/2904_CalculateImpacts/3.4

Timestamp:

07/25/18 18:19:51 (6 years ago)

Author:

fholzing

Message:

#2904: Removed unnecessary where-condition (.Where(...).Count()); Cloned the dataset before the .ToModifiable() call; Adapted the CalculateValue-Method for a single loop through the IEnumerables for the target and estimated values

File:

• branches/2904_CalculateImpacts/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs (modified) (3 diffs)

branches/2904_CalculateImpacts/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs

@@ -161 +161 @@
 
       int curIdx = 0;
-      int count = allowedInputVariables
-        .Where(v => problemData.Dataset.VariableHasType<double>(v) || problemData.Dataset.VariableHasType<string>(v))
-        .Count();
+      int count = allowedInputVariables.Count();
 
       foreach (var inputVariable in allowedInputVariables) {
@@ -198 +196 @@
 
       double impact = 0;
-      var modifiableDataset = ((Dataset)dataset).ToModifiable();
+      var modifiableDataset = ((Dataset)(dataset).Clone()).ToModifiable();
 
       // calculate impacts for double variables
@@ -369 +367 @@
     private static double CalculateValue(IEnumerable<double> targets, IEnumerable<double> estimates, out OnlineCalculatorError error) {
       calculator.Reset();
-      if (targets.Count() != estimates.Count()) {
+
+      var targetsEnumerator = targets.GetEnumerator();
+      var estimatesEnumerator = estimates.GetEnumerator();
+
+      bool targetsHasNextValue = targetsEnumerator.MoveNext();
+      bool estimatesHasNextValue = estimatesEnumerator.MoveNext();
+
+      while (targetsHasNextValue && estimatesHasNextValue) {
+        calculator.Add(targetsEnumerator.Current, estimatesEnumerator.Current);
+        targetsHasNextValue = targetsEnumerator.MoveNext();
+        estimatesHasNextValue = estimatesEnumerator.MoveNext();
+      }
+
+      //Check if there is an equal quantity of targets and estimates
+      if (targetsHasNextValue != estimatesHasNextValue) {
         throw new ArgumentException(string.Format("Targets and Estimates must be of equal length ({0},{1})", targets.Count(), estimates.Count()));
-      }
-      foreach (var entry in targets.Zip(estimates, (target, estimate) => new { target, estimate })) {
-        calculator.Add(entry.target, entry.estimate);
-      }
+
+      }
+
       error = calculator.ErrorState;
       return calculator.Value;