Changeset 8591


Ignore:
Timestamp:
09/06/12 15:37:05 (7 years ago)
Author:
sforsten
Message:

#1758: merged r8510:8590 from trunk to branch

Location:
branches/ChangeDatasetOfRegressionModel
Files:
5 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.cs

    r8513 r8591  
    9696      }
    9797
    98       int classValuesCount = Content.ProblemData.ClassValues.Count;
     98      int classValuesCount = Content.ProblemData.Classes;
    9999      int solutionsCount = Content.ClassificationSolutions.Count();
    100100      string[,] values = new string[indices.Length, 5 + classValuesCount + solutionsCount];
     
    114114            estimatedValuesVector[i].GroupBy(x => x).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
    115115          var estimationCount = groups.Where(g => g.Key != null).Select(g => g.Count).Sum();
    116           values[i, 4] =
    117             (((double)groups.Where(g => g.Key == estimatedClassValues[i]).Single().Count) / estimationCount).ToString();
    118           for (int classIndex = 0; classIndex < Content.ProblemData.ClassValues.Count; classIndex++) {
    119             var group = groups.Where(g => g.Key == Content.ProblemData.ClassValues[classIndex]).SingleOrDefault();
     116          values[i, 4] = (((double)groups.Where(g => g.Key == estimatedClassValues[i]).Single().Count) / estimationCount).ToString();
     117          for (int classIndex = 0; classIndex < Content.ProblemData.Classes; classIndex++) {
     118            var group = groups.Where(g => g.Key == Content.ProblemData.ClassValues.ElementAt(classIndex)).SingleOrDefault();
    120119            if (group == null) values[i, 5 + classIndex] = 0.ToString();
    121120            else values[i, 5 + classIndex] = group.Count.ToString();
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs

    r8513 r8591  
    238238      double[] thresholds = Content.Model.Thresholds.ToArray();
    239239      thresholds[classIndex] = e.NewLocationY;
     240      Array.Sort(thresholds);
    240241      Content.Model.SetThresholdsAndClassValues(thresholds, Content.Model.ClassValues);
    241242    }
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r8513 r8591  
    206206      <DependentUpon>ClusteringSolutionVisualizationView.cs</DependentUpon>
    207207    </Compile>
     208    <Compile Include="FeatureCorrelation\AbstractFeatureCorrelationView.cs">
     209      <SubType>UserControl</SubType>
     210    </Compile>
     211    <Compile Include="FeatureCorrelation\AbstractFeatureCorrelationView.Designer.cs">
     212      <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
     213    </Compile>
    208214    <Compile Include="DataAnalysisSolutionEvaluationView.cs">
    209215      <SubType>UserControl</SubType>
     
    212218      <DependentUpon>DataAnalysisSolutionEvaluationView.cs</DependentUpon>
    213219    </Compile>
     220    <Compile Include="FeatureCorrelation\FeatureCorrelationView.cs">
     221      <SubType>UserControl</SubType>
     222    </Compile>
     223    <Compile Include="FeatureCorrelation\FeatureCorrelationView.Designer.cs">
     224      <DependentUpon>FeatureCorrelationView.cs</DependentUpon>
     225    </Compile>
     226    <Compile Include="FeatureCorrelation\FeatureCorrelationCache.cs" />
     227    <Compile Include="FeatureCorrelation\FeatureCorrelationTimeframeCache.cs" />
    214228    <Compile Include="Plugin.cs" />
     229    <Compile Include="ProblemDataView.cs">
     230      <SubType>UserControl</SubType>
     231    </Compile>
     232    <Compile Include="ProblemDataView.Designer.cs">
     233      <DependentUpon>ProblemDataView.cs</DependentUpon>
     234    </Compile>
    215235    <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
    216236      <SubType>UserControl</SubType>
     
    340360    <Compile Include="Solution Views\RegressionSolutionView.Designer.cs">
    341361      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
     362    </Compile>
     363    <Compile Include="FeatureCorrelation\TimeframeFeatureCorrelationView.cs">
     364      <SubType>UserControl</SubType>
     365    </Compile>
     366    <Compile Include="FeatureCorrelation\TimeframeFeatureCorrelationView.Designer.cs">
     367      <DependentUpon>TimeframeFeatureCorrelationView.cs</DependentUpon>
    342368    </Compile>
    343369    <None Include="HeuristicLab.snk" />
     
    363389    </BootstrapperPackage>
    364390  </ItemGroup>
     391  <ItemGroup />
    365392  <ItemGroup>
    366     <Folder Include="obj\" />
     393    <EmbeddedResource Include="FeatureCorrelation\AbstractFeatureCorrelationView.resx">
     394      <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
     395    </EmbeddedResource>
    367396  </ItemGroup>
    368397  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.