Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/13/17 12:55:06 (7 years ago)
Author:
abeham
Message:

#2701: Updated branch to trunk

Location:
branches/MemPRAlgorithm
Files:
5 edited
10 copied

Legend:

Unmodified
Added
Removed

  • branches/MemPRAlgorithm

  • branches/MemPRAlgorithm/HeuristicLab.Problems.DataAnalysis.Views

  • branches/MemPRAlgorithm/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationCalculator.cs

    r14185 r14562  
    5050
    5151      IList<string> doubleVariableNames = dataset.DoubleVariables.ToList();
    52       OnlineCalculatorError error = OnlineCalculatorError.None;
     52
    5353      int length = doubleVariableNames.Count;
    5454      double[,] elements = new double[length, length];
    … …  
    6868          var var2 = dataset.GetDoubleValues(doubleVariableNames[j], indices);
    6969
     70          OnlineCalculatorError error = OnlineCalculatorError.None;
    7071          if (bwInfo.IgnoreMissingValues) {
    7172            var filtered = FilterNaNValues(var1, var2);
    … …  
    7879          }
    7980          elements[j, i] = elements[i, j];
    80 
    8181        });
    8282        worker.ReportProgress((int)(((double)counter) / length * 100));
    8383      }
     84
    8485      e.Result = elements;
    8586      worker.ReportProgress(100);

  • branches/MemPRAlgorithm/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r14348 r14562  
    246246      <DependentUpon>RegressionFeatureCorrelationView.cs</DependentUpon>
    247247    </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>
    248260    <Compile Include="Regression\RegressionSolutionVariableImpactsView.cs">
    249261      <SubType>UserControl</SubType>
    … …  
    409421    <Compile Include="Solution Views\TimeSeriesPrognosisSolutionView.Designer.cs">
    410422      <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>
    411435    </Compile>
    412436    <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisResultsView.cs">

  • branches/MemPRAlgorithm/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.cs

    r14307 r14562  
    112112      limitView.Content.Upper = axisMax;
    113113
    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
    116122      var variableValues = allowedInputVariables.Select(x => new List<double> { problemData.Dataset.GetDoubleValues(x, problemData.TrainingIndices).Median() });
    117123      if (sharedFixedVariables != null)
Note: See TracChangeset for help on using the changeset viewer.