Changeset 14110 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks

Timestamp:

07/19/16 14:47:39 (8 years ago)

Author:

mkommend

Message:

#2618: Removed obsolete code in friedman random functions and variable networks instance providers.

Location:

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

Files:

• VariableNetwork.cs (modified) (2 diffs)
• VariableNetworkInstanceProvider.cs (modified) (2 diffs)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Windows.Forms;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -87 +85 @@
 
     protected override List<List<double>> GenerateValues() {
-      // var shuffledIdx = Enumerable.Range(0, numberOfFeatures).Shuffle(random).ToList();
-
       // variable names are shuffled in the beginning (and sorted at the end)
       variableNames = variableNames.Shuffle(random).ToArray();
 
-      // a third of all variables are independen vars
+      // a third of all variables are independent vars
       List<List<double>> lvl0 = new List<List<double>>();
       int numLvl0 = (int)Math.Ceiling(numberOfFeatures * 0.33);

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;                                                         
+using System.Linq;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Random;
@@ -56 +56 @@
       if (varNetwork == null) throw new ArgumentException("VariableNetworkInstanceProvider expects an VariableNetwork data descriptor.");
       // base call generates a regression problem data
-      var regProblemData = base.LoadData(varNetwork);
-      var problemData =
-        new RegressionProblemData(
-          regProblemData.Dataset, regProblemData.AllowedInputVariables, regProblemData.TargetVariable);
-
-      // copy values from regProblemData to feature selection problem data
-      problemData.Name = regProblemData.Name;
+      var problemData = base.LoadData(varNetwork);
       problemData.Description = varNetwork.Description + Environment.NewLine + varNetwork.NetworkDefinition;
-      problemData.TrainingPartition.Start = regProblemData.TrainingPartition.Start;
-      problemData.TrainingPartition.End = regProblemData.TrainingPartition.End;
-      problemData.TestPartition.Start = regProblemData.TestPartition.Start;
-      problemData.TestPartition.End = regProblemData.TestPartition.End;
-
       return problemData;
     }