Changeset 14260

Timestamp:

08/19/16 11:16:20 (8 years ago)

Author:

bburlacu

Message:

#2660: Include instances with no noise. Improve formatting of problem description.

Location:

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks

Files:

• VariableNetwork.cs (modified) (4 diffs)
• VariableNetworkInstanceProvider.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks/VariableNetwork.cs

@@ -99 +99 @@
         var datai = Enumerable.Range(0, TestPartitionEnd).Select(_ => nrand.NextDouble()).ToList();
         inputVarNames.Add(new string[] { });
-        description.Add("~ N(0, 1)");
+        description.Add(" ~ N(0, 1)");
         lvl0.Add(datai);
       }
@@ -112 +112 @@
         var noisePrng = new NormalDistributedRandom(random, 0, sigma * Math.Sqrt(noiseRatio / (1.0 - noiseRatio)));
         lvl1.Add(x.Select(t => t + noisePrng.NextDouble()).ToList());
-
+        Array.Sort(selectedVarNames);
         inputVarNames.Add(selectedVarNames);
         var desc = string.Format("f({0})", string.Join(",", selectedVarNames));
@@ -127 +127 @@
         var noisePrng = new NormalDistributedRandom(random, 0, sigma * Math.Sqrt(noiseRatio / (1.0 - noiseRatio)));
         lvl2.Add(x.Select(t => t + noisePrng.NextDouble()).ToList());
-
+        Array.Sort(selectedVarNames);
         inputVarNames.Add(selectedVarNames);
         var desc = string.Format("f({0})", string.Join(",", selectedVarNames));
@@ -142 +142 @@
         var noisePrng = new NormalDistributedRandom(random, 0, sigma * Math.Sqrt(noiseRatio / (1.0 - noiseRatio)));
         lvl3.Add(x.Select(t => t + noisePrng.NextDouble()).ToList());
-
+        Array.Sort(selectedVarNames);
         inputVarNames.Add(selectedVarNames);
         var desc = string.Format("f({0})", string.Join(",", selectedVarNames));
         description.Add(string.Format(" ~ N({0}, {1:N3})", desc, noisePrng.Sigma));
       }
-
-      networkDefinition = string.Join(Environment.NewLine, variableNames.Zip(description, (n, d) => n + d));
+      networkDefinition = string.Join(Environment.NewLine, variableNames.Zip(description, (n, d) => n + d).OrderBy(x => x));
       // for graphviz
       networkDefinition += Environment.NewLine + "digraph G {";

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks/VariableNetworkInstanceProvider.cs

@@ -49 +49 @@
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       var numVariables = new int[] { 10, 20, 50, 100 };
-      var noiseRatios = new double[] { 0.01, 0.05, 0.1 };
+      var noiseRatios = new double[] { 0, 0.01, 0.05, 0.1 };
       var rand = new MersenneTwister((uint)Seed); // use fixed seed for deterministic problem generation
       return (from size in numVariables