Changeset 17779 for branches/3022-FastFunctionExtraction/FFX/ProductBaseFunction.cs

Timestamp:

10/29/20 15:24:40 (3 years ago)

Author:

gkronber

Message:

#3022: made a few changes while reviewing the code.

File:

• branches/3022-FastFunctionExtraction/FFX/ProductBaseFunction.cs (modified) (2 diffs)

branches/3022-FastFunctionExtraction/FFX/ProductBaseFunction.cs

@@ -8 +8 @@
         public IBasisFunction B2 { get; set; }
 
-        public int Complexity
-            => 1 + B1.Complexity + B2.Complexity;
+        public int Complexity => 1 + B1.Complexity + B2.Complexity;
 
-        public bool IsNominator { get; set; }
+        public bool IsDenominator { get; set; }
 
-        public ProductBaseFunction(IBasisFunction b1, IBasisFunction b2, bool nominator) {
+        public ProductBaseFunction(IBasisFunction b1, IBasisFunction b2, bool isDenominator) {
             B1 = b1 ?? throw new ArgumentNullException(nameof(b1));
             B2 = b2 ?? throw new ArgumentNullException(nameof(b2));
-            IsNominator = nominator;
+            IsDenominator = isDenominator;
         }
 
-        public double[] Simulate(IRegressionProblemData data) {
-            return B1.Simulate(data).Zip(B2.Simulate(data), (a, b) => a * b).ToArray();
+        public double[] Evaluate(IRegressionProblemData data) {
+            return B1.Evaluate(data).Zip(B2.Evaluate(data), (a, b) => a * b).ToArray();
         }
 
@@ -28 +27 @@
 
         public IBasisFunction DeepCopy() {
-            return new ProductBaseFunction(B1, B2, IsNominator);
+            return new ProductBaseFunction(B1, B2, IsDenominator);
         }
     }