- Timestamp:
- 01/13/17 12:55:06 (8 years ago)
- Location:
- branches/MemPRAlgorithm
- Files:
-
- 5 edited
- 10 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/MemPRAlgorithm
-
branches/MemPRAlgorithm/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views (added) merged: 14422,14464,14468-14469,14483,14486,14531-14532
- Property svn:mergeinfo changed
-
branches/MemPRAlgorithm/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationCalculator.cs
r14185 r14562 50 50 51 51 IList<string> doubleVariableNames = dataset.DoubleVariables.ToList(); 52 OnlineCalculatorError error = OnlineCalculatorError.None; 52 53 53 int length = doubleVariableNames.Count; 54 54 double[,] elements = new double[length, length]; … … 68 68 var var2 = dataset.GetDoubleValues(doubleVariableNames[j], indices); 69 69 70 OnlineCalculatorError error = OnlineCalculatorError.None; 70 71 if (bwInfo.IgnoreMissingValues) { 71 72 var filtered = FilterNaNValues(var1, var2); … … 78 79 } 79 80 elements[j, i] = elements[i, j]; 80 81 81 }); 82 82 worker.ReportProgress((int)(((double)counter) / length * 100)); 83 83 } 84 84 85 e.Result = elements; 85 86 worker.ReportProgress(100); -
branches/MemPRAlgorithm/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r14348 r14562 246 246 <DependentUpon>RegressionFeatureCorrelationView.cs</DependentUpon> 247 247 </Compile> 248 <Compile Include="Regression\RegressionSolutionLineChartViewBase.cs"> 249 <SubType>UserControl</SubType> 250 </Compile> 251 <Compile Include="Regression\RegressionSolutionLineChartViewBase.Designer.cs"> 252 <DependentUpon>RegressionSolutionLineChartViewBase.cs</DependentUpon> 253 </Compile> 254 <Compile Include="Regression\RegressionSolutionResidualsLineChartView.cs"> 255 <SubType>UserControl</SubType> 256 </Compile> 257 <Compile Include="Regression\RegressionSolutionResidualsLineChartView.Designer.cs"> 258 <DependentUpon>RegressionSolutionResidualsLineChartView.cs</DependentUpon> 259 </Compile> 248 260 <Compile Include="Regression\RegressionSolutionVariableImpactsView.cs"> 249 261 <SubType>UserControl</SubType> … … 409 421 <Compile Include="Solution Views\TimeSeriesPrognosisSolutionView.Designer.cs"> 410 422 <DependentUpon>TimeSeriesPrognosisSolutionView.cs</DependentUpon> 423 </Compile> 424 <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisResidualsLineChartView.cs"> 425 <SubType>UserControl</SubType> 426 </Compile> 427 <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisResidualsLineChartView.Designer.cs"> 428 <DependentUpon>TimeSeriesPrognosisResidualsLineChartView.cs</DependentUpon> 429 </Compile> 430 <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisLineChartView.cs"> 431 <SubType>UserControl</SubType> 432 </Compile> 433 <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisLineChartView.Designer.cs"> 434 <DependentUpon>TimeSeriesPrognosisLineChartView.cs</DependentUpon> 411 435 </Compile> 412 436 <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisResultsView.cs"> -
branches/MemPRAlgorithm/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.cs
r14307 r14562 112 112 limitView.Content.Upper = axisMax; 113 113 114 // create dataset 115 var allowedInputVariables = Content.ProblemData.AllowedInputVariables; 114 // create dataset of problemData input variables and model input variables 115 // necessary workaround to have the variables in the occuring order 116 var inputvariables = 117 new HashSet<string>(Content.ProblemData.AllowedInputVariables.Union(Content.Model.VariablesUsedForPrediction)); 118 var allowedInputVariables = 119 Content.ProblemData.Dataset.VariableNames.Where(v => inputvariables.Contains(v)).ToList(); 120 121 116 122 var variableValues = allowedInputVariables.Select(x => new List<double> { problemData.Dataset.GetDoubleValues(x, problemData.TrainingIndices).Median() }); 117 123 if (sharedFixedVariables != null)
Note: See TracChangeset
for help on using the changeset viewer.