Changeset 11907 for stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GeSymbolicRegressionSampleTest.cs

Timestamp:

02/05/15 10:51:29 (9 years ago)

Author:

jkarder

Message:

#2211: merged r11450, r11466, r11483, r11514, r11515 and r11890 into stable
#2234: merged r11308, r11309, r11326, r11337, r11340, r11339, r11342, r11361, r11427, r11447, r11464, r11542, r11544, r11545, r11547, r11548 into stable
#2239: merged r11437, r11439 and r11472 into stable
#2262: merged r11436, r11440, r11471, r11474, r11477, r11479, r11480, r11605, r11657, r11721, r11734, r11735, r11787, r11788, r11789 and r11826 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GeSymbolicRegressionSampleTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GeSymbolicRegressionSampleTest.cs) (8 diffs)

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GeSymbolicRegressionSampleTest.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Tests {
-  /// <summary>
-  /// Summary description for GeSymbolicRegressionSampleTest
-  /// </summary>
   [TestClass]
   public class GeSymbolicRegressionSampleTest {
-    private const string samplesDirectory = SamplesUtils.Directory;
-    [ClassInitialize]
-    public static void MyClassInitialize(TestContext testContext) {
-      if (!Directory.Exists(samplesDirectory))
-        Directory.CreateDirectory(samplesDirectory);
-    }
+    #region artificial ant
+    private const string GeArtificialAntSampleFileName = "GE_ArtificialAnt";
 
-    #region artificial ant
     [TestMethod]
     [TestCategory("Samples.Create")]
@@ -48 +40 @@
     public void CreateGeArtificialAntSampleTest() {
       var geaa = CreateGeArtificialAntSample();
-      XmlGenerator.Serialize(geaa, @"Samples\GE_ArtificialAnt.hl");
+      string path = Path.Combine(SamplesUtils.SamplesDirectory, GeArtificialAntSampleFileName + SamplesUtils.SampleFileExtension);
+      XmlGenerator.Serialize(geaa, path);
     }
 
@@ -62 +55 @@
     public OffspringSelectionGeneticAlgorithm CreateGeArtificialAntSample() {
       OffspringSelectionGeneticAlgorithm ga = new OffspringSelectionGeneticAlgorithm();
+
       #region Problem Configuration
       var problem = new HeuristicLab.Problems.GrammaticalEvolution.GEArtificialAntProblem();
@@ -72 +66 @@
         ga, 200, 1, 50, 0.05, 200);
       #endregion
+
       return ga;
     }
@@ -77 +72 @@
 
     #region symbolic regression
-    #endregion
+    private const string GeSymbolicRegressionSampleFileName = "GE_SymbReg";
+
     [TestMethod]
     [TestCategory("Samples.Create")]
@@ -83 +79 @@
     public void CreateGeSymbolicRegressionSampleTest() {
       var geSymbReg = CreateGeSymbolicRegressionSample();
-      XmlGenerator.Serialize(geSymbReg, @"Samples\GE_SymbReg.hl");
+      string path = Path.Combine(SamplesUtils.SamplesDirectory, GeSymbolicRegressionSampleFileName + SamplesUtils.SampleFileExtension);
+      XmlGenerator.Serialize(geSymbReg, path);
     }
 
@@ -97 +94 @@
     public OffspringSelectionGeneticAlgorithm CreateGeSymbolicRegressionSample() {
       var ga = new OffspringSelectionGeneticAlgorithm();
+
       #region Problem Configuration
       var problem = new HeuristicLab.Problems.GrammaticalEvolution.GESymbolicRegressionSingleObjectiveProblem();
@@ -116 +114 @@
         ga, 1000, 1, 50, 0.05, 200);
       #endregion
+
       return ga;
     }
+    #endregion
   }
 }