Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassification.cs
- Timestamp:
- 07/26/12 09:51:13 (12 years ago)
- Location:
- branches/ScatterSearch (trunk integration)
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ScatterSearch (trunk integration)
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassification.cs
r7259 r8331 57 57 get { return (IFixedValueParameter<DoubleValue>)Parameters[DecayParameterName]; } 58 58 } 59 public ConstrainedValueParameter<IntValue> HiddenLayersParameter {60 get { return ( ConstrainedValueParameter<IntValue>)Parameters[HiddenLayersParameterName]; }59 public IConstrainedValueParameter<IntValue> HiddenLayersParameter { 60 get { return (IConstrainedValueParameter<IntValue>)Parameters[HiddenLayersParameterName]; } 61 61 } 62 62 public IFixedValueParameter<IntValue> NodesInFirstHiddenLayerParameter { … … 171 171 string targetVariable = problemData.TargetVariable; 172 172 IEnumerable<string> allowedInputVariables = problemData.AllowedInputVariables; 173 IEnumerable<int> rows = problemData.TrainingIndi zes;173 IEnumerable<int> rows = problemData.TrainingIndices; 174 174 double[,] inputMatrix = AlglibUtil.PrepareInputMatrix(dataset, allowedInputVariables.Concat(new string[] { targetVariable }), rows); 175 175 if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x))) … … 181 181 int nClasses = classValues.Count(); 182 182 // map original class values to values [0..nClasses-1] 183 Dictionary<double, double> classIndi zes = new Dictionary<double, double>();183 Dictionary<double, double> classIndices = new Dictionary<double, double>(); 184 184 for (int i = 0; i < nClasses; i++) { 185 classIndi zes[classValues[i]] = i;185 classIndices[classValues[i]] = i; 186 186 } 187 187 for (int row = 0; row < nRows; row++) { 188 inputMatrix[row, nFeatures] = classIndi zes[inputMatrix[row, nFeatures]];188 inputMatrix[row, nFeatures] = classIndices[inputMatrix[row, nFeatures]]; 189 189 } 190 190
Note: See TracChangeset
for help on using the changeset viewer.