Changeset 17645

Timestamp:

07/03/20 09:03:12 (4 years ago)

Author:

chaider

Message:

#3075

• Updated instances (removed 2*pi term from equations)
• Added instances to InstanceProvider

Location:

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

Files:

• Feynman37.cs (modified) (1 diff)
• Feynman39.cs (modified) (1 diff)
• Feynman44.cs (modified) (1 diff)
• Feynman79.cs (modified) (1 diff)
• Feynman86.cs (modified) (1 diff)
• Feynman87.cs (modified) (1 diff)
• Feynman88.cs (modified) (1 diff)
• Feynman89.cs (modified) (1 diff)
• Feynman90.cs (modified) (1 diff)
• Feynman92.cs (modified) (1 diff)
• Feynman93.cs (modified) (1 diff)
• Feynman96.cs (modified) (1 diff)
• Feynman99.cs (modified) (1 diff)
• FeynmanInstanceProvider.cs (modified) (2 diffs)

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

@@ -52 +52 @@
 
       for (var i = 0; i < omega.Count; i++) {
-        var res = h[i] / (2 * Math.PI) * omega[i];
+        var res = h[i] * omega[i];
         E_n.Add(res);
       }

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

@@ -58 +58 @@
 
       for (var i = 0; i < m.Count; i++) {
-        var res = 4 * Math.PI * epsilon[i] * Math.Pow(h[i] / (2 * Math.PI), 2) / (m[i] * Math.Pow(q[i], 2));
+        var res = 4 * Math.PI * epsilon[i] * Math.Pow(h[i], 2) / (m[i] * Math.Pow(q[i], 2));
         r.Add(res);
       }

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

@@ -62 +62 @@
 
       for (var i = 0; i < omega.Count; i++) {
-        var res = h[i] / (2 * Math.PI) * Math.Pow(omega[i], 3) /
+        var res = h[i] * Math.Pow(omega[i], 3) /
                   (Math.Pow(Math.PI, 2) * Math.Pow(c[i], 2) *
-                   (Math.Exp(h[i] / (2 * Math.PI) * omega[i] / (kb[i] * T[i])) - 1));
+                   (Math.Exp(h[i]  * omega[i] / (kb[i] * T[i])) - 1));
         L_rad.Add(res);
       }

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

@@ -58 +58 @@
 
       for (var i = 0; i < g_.Count; i++) {
-        var res = g_[i] * mom[i] * B[i] * Jz[i] / (h[i] / (2 * Math.PI));
+        var res = g_[i] * mom[i] * B[i] * Jz[i] / (h[i]);
         ;
         E_n.Add(res);

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

@@ -58 +58 @@
 
       for (var i = 0; i < h.Count; i++) {
-        var res = 1.0 / (Math.Exp(h[i] / (2 * Math.PI) * omega[i] / (kb[i] * T[i])) - 1);
+        var res = 1.0 / (Math.Exp(h[i] * omega[i] / (kb[i] * T[i])) - 1);
         n.Add(res);
       }

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

@@ -59 +59 @@
 
       for (var i = 0; i < h.Count; i++) {
-        var res = h[i] / (2 * Math.PI) * omega[i] / (Math.Exp(h[i] / (2 * Math.PI) * omega[i] / (kb[i] * T[i])) - 1);
+        var res = h[i]  * omega[i] / (Math.Exp(h[i] * omega[i] / (kb[i] * T[i])) - 1);
         E_n.Add(res);
       }

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

@@ -54 +54 @@
 
       for (var i = 0; i < mom.Count; i++) {
-        var res = 2 * mom[i] * B[i] / (h[i] / (2 * Math.PI));
+        var res = 2 * mom[i] * B[i] / (h[i]);
         omega.Add(res);
       }

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

@@ -54 +54 @@
 
       for (var i = 0; i < E_n.Count; i++) {
-        var res = Math.Pow(Math.Sin(E_n[i] * t[i] / (h[i] / (2 * Math.PI))), 2);
+        var res = Math.Pow(Math.Sin(E_n[i] * t[i] / (h[i])), 2);
         prob.Add(res);
       }

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

@@ -70 +70 @@
 
       for (var i = 0; i < p_d.Count; i++) {
-        var res = p_d[i] * Ef[i] * t[i] / (h[i] / (2 * Math.PI)) *
+        var res = p_d[i] * Ef[i] * t[i] / (h[i]) *
                   Math.Pow(Math.Sin((omega[i] - omega_0[i]) * t[i] / 2), 2) /
                   Math.Pow((omega[i] - omega_0[i]) * t[i] / 2, 2);

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

@@ -52 +52 @@
 
       for (var i = 0; i < n.Count; i++) {
-        var res = n[i] * (h[i] / (2 * Math.PI));
+        var res = n[i] * (h[i]);
         L.Add(res);
       }

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

@@ -56 +56 @@
 
       for (var i = 0; i < E_n.Count; i++) {
-        var res = 2 * E_n[i] * Math.Pow(d[i], 2) * k[i] / (h[i] / (2 * Math.PI));
+        var res = 2 * E_n[i] * Math.Pow(d[i], 2) * k[i] / (h[i]);
         v.Add(res);
       }

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

@@ -54 +54 @@
 
       for (var i = 0; i < h.Count; i++) {
-        var res = h[i] / Math.Pow(2 * Math.PI, 2) / (2 * E_n[i] * Math.Pow(d[i], 2));
+        var res = Math.Pow(h[i], 2)  / (2 * E_n[i] * Math.Pow(d[i], 2));
         m.Add(res);
       }

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

@@ -62 +62 @@
       for (var i = 0; i < m.Count; i++) {
         var res = -m[i] * Math.Pow(q[i], 4) / (2 * Math.Pow(4 * Math.PI * epsilon[i], 2) *
-                                               Math.Pow(h[i] / (2 * Math.PI), 2) * (1.0 / Math.Pow(n[i], 2)));
+                                               Math.Pow(h[i], 2) * (1.0 / Math.Pow(n[i], 2)));
         E_n.Add(res);
       }

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

@@ -32 +32 @@
       var descriptorList = new List<IDataDescriptor>();
       var rand           = new MersenneTwister((uint) Seed);
-      descriptorList.Add(new Feynman1(rand.Next(), 10000, 10000));
+      descriptorList.Add(new Feynman1(rand.Next()));
       descriptorList.Add(new Feynman2(rand.Next()));
       descriptorList.Add(new Feynman3(rand.Next()));
@@ -133 +133 @@
       descriptorList.Add(new Feynman100(rand.Next()));
 
+      descriptorList.Add(new Feynman1(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman2(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman3(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman4(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman5(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman6(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman7(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman8(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman9(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman10(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman11(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman12(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman13(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman14(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman15(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman16(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman17(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman18(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman19(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman20(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman21(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman22(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman23(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman24(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman25(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman26(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman27(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman28(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman29(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman30(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman31(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman32(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman33(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman34(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman35(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman36(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman37(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman38(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman39(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman40(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman41(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman42(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman43(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman44(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman45(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman46(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman47(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman48(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman49(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman50(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman51(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman52(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman53(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman54(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman55(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman56(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman57(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman58(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman59(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman60(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman61(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman62(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman63(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman64(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman65(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman66(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman67(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman68(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman69(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman70(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman71(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman72(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman73(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman74(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman75(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman76(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman77(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman78(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman79(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman80(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman81(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman82(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman83(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman84(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman85(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman86(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman87(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman88(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman89(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman90(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman91(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman92(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman93(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman94(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman95(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman96(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman97(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman98(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman99(rand.Next(), 100, 100));
+      descriptorList.Add(new Feynman100(rand.Next(), 100, 100));
+
+      descriptorList.Add(new FeynmanBonus1(rand.Next()));
+      descriptorList.Add(new FeynmanBonus2(rand.Next()));
+      descriptorList.Add(new FeynmanBonus3(rand.Next()));
+      descriptorList.Add(new FeynmanBonus4(rand.Next()));
+      descriptorList.Add(new FeynmanBonus5(rand.Next()));
+      descriptorList.Add(new FeynmanBonus6(rand.Next()));
+      descriptorList.Add(new FeynmanBonus7(rand.Next()));
+      descriptorList.Add(new FeynmanBonus8(rand.Next()));
+      descriptorList.Add(new FeynmanBonus9(rand.Next()));
+      descriptorList.Add(new FeynmanBonus10(rand.Next()));
+      descriptorList.Add(new FeynmanBonus11(rand.Next()));
+      descriptorList.Add(new FeynmanBonus12(rand.Next()));
+      descriptorList.Add(new FeynmanBonus13(rand.Next()));
+      descriptorList.Add(new FeynmanBonus14(rand.Next()));
+      descriptorList.Add(new FeynmanBonus15(rand.Next()));
+      descriptorList.Add(new FeynmanBonus16(rand.Next()));
+      descriptorList.Add(new FeynmanBonus17(rand.Next()));
+      descriptorList.Add(new FeynmanBonus18(rand.Next()));
+      descriptorList.Add(new FeynmanBonus19(rand.Next()));
+      descriptorList.Add(new FeynmanBonus20(rand.Next()));
+
+      descriptorList.Add(new FeynmanBonus1(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus2(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus3(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus4(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus5(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus6(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus7(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus8(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus9(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus10(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus11(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus12(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus13(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus14(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus15(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus16(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus17(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus18(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus19(rand.Next(), 100, 100));
+      descriptorList.Add(new FeynmanBonus20(rand.Next(), 100, 100));
+
+
       return descriptorList;
     }