Changeset 8430 for branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassification.cs

Timestamp:

08/08/12 14:04:17 (12 years ago)

Author:

mkommend

Message:

#1081: Intermediate commit of trunk updates - interpreter changes must be redone.

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassification.cs (modified) (3 diffs)

branches/HeuristicLab.TimeSeries

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab.TimeSeries-3.3

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab.TimeSeries-3.3

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.DataAnalysis/3.4

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.user

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.user

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassification.cs

@@ -53 +53 @@
       get { return (IFixedValueParameter<DoubleValue>)Parameters[DecayParameterName]; }
     }
-    public ConstrainedValueParameter<IntValue> HiddenLayersParameter {
-      get { return (ConstrainedValueParameter<IntValue>)Parameters[HiddenLayersParameterName]; }
+    public IConstrainedValueParameter<IntValue> HiddenLayersParameter {
+      get { return (IConstrainedValueParameter<IntValue>)Parameters[HiddenLayersParameterName]; }
     }
     public IFixedValueParameter<IntValue> NodesInFirstHiddenLayerParameter {
@@ -185 +185 @@
       string targetVariable = problemData.TargetVariable;
       IEnumerable<string> allowedInputVariables = problemData.AllowedInputVariables;
-      IEnumerable<int> rows = problemData.TrainingIndizes;
+      IEnumerable<int> rows = problemData.TrainingIndices;
       double[,] inputMatrix = AlglibUtil.PrepareInputMatrix(dataset, allowedInputVariables.Concat(new string[] { targetVariable }), rows);
       if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x)))
@@ -195 +195 @@
       int nClasses = classValues.Count();
       // map original class values to values [0..nClasses-1]
-      Dictionary<double, double> classIndizes = new Dictionary<double, double>();
+      Dictionary<double, double> classIndices = new Dictionary<double, double>();
       for (int i = 0; i < nClasses; i++) {
-        classIndizes[classValues[i]] = i;
+        classIndices[classValues[i]] = i;
       }
       for (int row = 0; row < nRows; row++) {
-        inputMatrix[row, nFeatures] = classIndizes[inputMatrix[row, nFeatures]];
+        inputMatrix[row, nFeatures] = classIndices[inputMatrix[row, nFeatures]];
       }
 

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab.TimeSeries-3.3

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.user