Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/30/21 12:18:19 (4 years ago)
Author:
gkronber
Message:

#3106 merged r17856:17969 from trunk to branch

Location:
branches/3106_AnalyticContinuedFractionsRegression
Files:
2 deleted
8 edited
9 copied

Legend:

Unmodified
Added
Removed

  • branches/3106_AnalyticContinuedFractionsRegression

  • branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Views

  • branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/FactorPartialDependencePlot.cs

    r17180 r17970  
    222222        if (updateOnFinish)
    223223          Update();
    224       } catch (OperationCanceledException) { 
     224      } catch (OperationCanceledException) {
    225225      } catch (AggregateException ae) {
    226226        if (!ae.InnerExceptions.Any(e => e is OperationCanceledException))
    … …  
    434434      var refSolution = solutions.First();
    435435      var refSolVars = refSolution.ProblemData.Dataset.VariableNames;
     436      var refFactorVars = refSolution.ProblemData.Dataset.StringVariables;
     437      var distinctVals = refFactorVars.ToDictionary(fv => fv, fv => refSolution.ProblemData.Dataset.GetStringValues(fv).Distinct().ToArray());
     438
    436439      foreach (var solution in solutions.Skip(1)) {
    437         var variables1 = solution.ProblemData.Dataset.VariableNames;
    438         if (!variables1.All(refSolVars.Contains))
     440        var variables1 = new HashSet<string>(solution.ProblemData.Dataset.VariableNames);
     441        if (!variables1.IsSubsetOf(refSolVars))
    439442          return false;
    440443
    441         foreach (var factorVar in variables1.Where(solution.ProblemData.Dataset.VariableHasType<string>)) {
    442           var distinctVals = refSolution.ProblemData.Dataset.GetStringValues(factorVar).Distinct();
    443           if (solution.ProblemData.Dataset.GetStringValues(factorVar).Any(val => !distinctVals.Contains(val))) return false;
     444        foreach (var factorVar in solution.ProblemData.Dataset.StringVariables) {
     445          var refValues = distinctVals[factorVar];
     446          var values = new HashSet<string>(solution.ProblemData.Dataset.GetStringValues(factorVar));
     447
     448          if (!values.IsSubsetOf(refValues))
     449            return false;
    444450        }
    445451      }

  • branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs

    r17775 r17970  
    530530
    531531    public async Task AddSolutionAsync(IRegressionSolution solution) {
     532      if (solutions.Contains(solution))
     533        return;
    532534      if (!SolutionsCompatible(solutions.Concat(new[] { solution })))
    533535        throw new ArgumentException("The solution is not compatible with the problem data.");
    534       if (solutions.Contains(solution))
    535         return;
    536536
    537537      solutions.Add(solution);
    … …  
    568568      var refSolution = solutions.First();
    569569      var refSolVars = refSolution.ProblemData.Dataset.VariableNames;
     570      var refFactorVars = refSolution.ProblemData.Dataset.StringVariables;
     571      var distinctVals = refFactorVars.ToDictionary(fv => fv, fv => refSolution.ProblemData.Dataset.GetStringValues(fv).Distinct().ToArray());
     572
    570573      foreach (var solution in solutions.Skip(1)) {
    571         var variables1 = solution.ProblemData.Dataset.VariableNames;
    572         if (!variables1.All(refSolVars.Contains))
     574        var variables1 = new HashSet<string>(solution.ProblemData.Dataset.VariableNames);
     575        if (!variables1.IsSubsetOf(refSolVars))
    573576          return false;
    574577
    575         foreach (var factorVar in variables1.Where(solution.ProblemData.Dataset.VariableHasType<string>)) {
    576           var distinctVals = refSolution.ProblemData.Dataset.GetStringValues(factorVar).Distinct();
    577           if (solution.ProblemData.Dataset.GetStringValues(factorVar).Any(val => !distinctVals.Contains(val))) return false;
     578        foreach (var factorVar in solution.ProblemData.Dataset.StringVariables) {
     579          var refValues = distinctVals[factorVar];
     580          var values = new HashSet<string>(solution.ProblemData.Dataset.GetStringValues(factorVar));
     581
     582          if (!values.IsSubsetOf(refValues))
     583            return false;
    578584        }
    579585      }

  • branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r17579 r17970  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103       <Private>False</Private>
     101    <Reference Include="ALGLIB-3.17.0, Version=3.17.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <SpecificVersion>False</SpecificVersion>
     103      <HintPath>..\..\bin\ALGLIB-3.17.0.dll</HintPath>
     104      <Private>False</Private>
     105    </Reference>
     106    <Reference Include="HEAL.Attic, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <SpecificVersion>False</SpecificVersion>
     108      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
    104109    </Reference>
    105110    <Reference Include="System" />
    … …  
    221226    <Compile Include="Interfaces\IDataPreprocessorStarter.cs" />
    222227    <Compile Include="Interfaces\IPartialDependencePlot.cs" />
    223     <Compile Include="IntervalCollectionView.cs">
    224       <SubType>UserControl</SubType>
    225     </Compile>
    226     <Compile Include="IntervalCollectionView.Designer.cs">
    227       <DependentUpon>IntervalCollectionView.cs</DependentUpon>
    228     </Compile>
    229228    <Compile Include="MenuItems\ChangeDataOfOptimizersMenuItem.cs" />
    230229    <Compile Include="MenuItems\ShrinkDataAnalysisRunsMenuItem.cs" />
    … …  
    242241      <DependentUpon>ProblemDataView.cs</DependentUpon>
    243242    </Compile>
     243    <Compile Include="Properties\Resources.Designer.cs">
     244      <AutoGen>True</AutoGen>
     245      <DesignTime>True</DesignTime>
     246      <DependentUpon>Resources.resx</DependentUpon>
     247    </Compile>
    244248    <Compile Include="Regression\ConfidenceRegressionSolutionEstimatedValuesView.cs">
    245249      <SubType>UserControl</SubType>
    … …  
    254258      <DependentUpon>ConfidenceRegressionSolutionLineChartView.cs</DependentUpon>
    255259    </Compile>
     260    <Compile Include="Regression\IntervalCollectionView.cs">
     261      <SubType>UserControl</SubType>
     262    </Compile>
     263    <Compile Include="Regression\IntervalCollectionView.Designer.cs">
     264      <DependentUpon>IntervalCollectionView.cs</DependentUpon>
     265    </Compile>
    256266    <Compile Include="Regression\RegressionEnsembleSolutionModelWeightsView.cs">
    257267      <SubType>UserControl</SubType>
    … …  
    343353    <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">
    344354      <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
     355    </Compile>
     356    <Compile Include="Regression\ShapeConstraintsView.cs">
     357      <SubType>UserControl</SubType>
     358    </Compile>
     359    <Compile Include="Regression\ShapeConstraintsView.Designer.cs">
     360      <DependentUpon>ShapeConstraintsView.cs</DependentUpon>
     361    </Compile>
     362    <Compile Include="Regression\ShapeConstraintView.cs">
     363      <SubType>UserControl</SubType>
     364    </Compile>
     365    <Compile Include="Regression\ShapeConstraintView.Designer.cs">
     366      <DependentUpon>ShapeConstraintView.cs</DependentUpon>
    345367    </Compile>
    346368    <Compile Include="Solution Views\ClassificationSolutionView.cs">
    … …  
    605627      <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
    606628    </EmbeddedResource>
     629    <EmbeddedResource Include="Properties\Resources.resx">
     630      <Generator>ResXFileCodeGenerator</Generator>
     631      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     632    </EmbeddedResource>
    607633  </ItemGroup>
    608634  <ItemGroup>
    609     <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    610       <SpecificVersion>False</SpecificVersion>
    611       <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
    612       <Private>False</Private>
    613     </Reference>
     635    <EmbeddedResource Include="Resources\shapeConstraintsHelp.rtf" />
     636    <None Include="Resources\VS2008ImageLibrary_Annotations_Information.png" />
    614637  </ItemGroup>
    615638  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame

    r17184 r17970  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Views", "Provides views for base classes for data analysis tasks.", "3.4.12.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.17.0")]
    3131  [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")]
    3232  [PluginDependency("HeuristicLab.Analysis", "3.3")]

  • branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.cs

    r17180 r17970  
    8181        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].LegendText = ESTIMATEDVALUES_TRAINING_SERIES_NAME;
    8282        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].ChartType = SeriesChartType.FastLine;
    83         this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].EmptyPointStyle.Color = this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Color;
    8483        int[] trainingIdx;
    8584        double[] trainingY;
    … …  
    120119        double min = double.MaxValue, max = double.MinValue;
    121120        foreach (var point in chart.Series.SelectMany(x => x.Points)) {
    122           if (!point.YValues.Any() || double.IsInfinity(point.YValues[0]) || double.IsNaN(point.YValues[0]))
     121          if (point.IsEmpty || !point.YValues.Any() || double.IsInfinity(point.YValues[0]) || double.IsNaN(point.YValues[0]))
    123122            continue;
    124123          var y = point.YValues[0];

  • branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionPartialDependencePlotView.cs

    r17180 r17970  
    119119
    120120      // create dataset of problemData input variables and model input variables
    121       // necessary workaround to have the variables in the occuring order
     121      // necessary workaround to have the variables in the occurring order
    122122      var inputvariables =
    123123        new HashSet<string>(Content.ProblemData.AllowedInputVariables.Union(Content.Model.VariablesUsedForPrediction));
Note: See TracChangeset for help on using the changeset viewer.