Changeset 17674 for branches/3075_aifeynman_instances/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman82.cs

Timestamp:

07/17/20 16:51:22 (4 years ago)

Author:

gkronber

Message:

#3075 small changes while reviewing

File:

• branches/3075_aifeynman_instances/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman82.cs (modified) (5 diffs)

branches/3075_aifeynman_instances/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman82.cs

@@ -29 +29 @@
       get {
         return string.Format(
-          "II.36.38 mom*H/(kb*T)+(mom*alpha)/(epsilon*c**2*kb*T)*M | {0} samples | noise ({1})",
+          "II.36.38 mom*B/(kb*T)+(mom*alpha*M)/(epsilon*c**2*kb*T) | {0} samples | noise ({1})",
           trainingSamples, noiseRatio == null ? "no noise" : noiseRatio.ToString());
       }
@@ -37 +37 @@
 
     protected override string[] VariableNames {
-      get { return new[] {"mom", "H", "kb", "T", "alpha", "epsilon", "c", "M", noiseRatio == null ? "f" : "f_noise"}; }
+      get { return new[] {"mom", "B", "kb", "T", "alpha", "epsilon", "c", "M", noiseRatio == null ? "f" : "f_noise"}; }
     }
 
     protected override string[] AllowedInputVariables {
-      get { return new[] {"mom", "H", "kb", "T", "alpha", "epsilon", "c", "M"}; }
+      get { return new[] {"mom", "B", "kb", "T", "alpha", "epsilon", "c", "M"}; }
     }
 
@@ -56 +56 @@
       var data    = new List<List<double>>();
       var mom     = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 1, 3).ToList();
-      var H       = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 1, 3).ToList();
+      var B       = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 1, 3).ToList();
       var kb      = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 1, 3).ToList();
       var T       = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 1, 3).ToList();
@@ -67 +67 @@
 
       data.Add(mom);
-      data.Add(H);
+      data.Add(B);
       data.Add(kb);
       data.Add(T);
@@ -77 +77 @@
 
       for (var i = 0; i < mom.Count; i++) {
-        var res = mom[i] * H[i] / (kb[i] * T[i]) +
-                  mom[i] * alpha[i] / (epsilon[i] * Math.Pow(c[i], 2) * kb[i] * T[i]) * M[i];
+        var res = mom[i] * B[i] / (kb[i] * T[i]) +
+                  mom[i] * alpha[i] * M[i] / (epsilon[i] * Math.Pow(c[i], 2) * kb[i] * T[i]);
         f.Add(res);
       }