Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/20/11 13:54:57 (13 years ago)
Author:
spimming
Message:

#1680:

  • merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:
branches/HeuristicLab.Hive.Azure
Files:
3 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive.Azure

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj

    r6866 r7215  
    219219  </ItemGroup>
    220220  <ItemGroup>
    221     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    222       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    223       <Name>HeuristicLab.Collections-3.3</Name>
    224       <Private>False</Private>
    225     </ProjectReference>
    226     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    227       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    228       <Name>HeuristicLab.Common-3.3</Name>
    229       <Private>False</Private>
    230     </ProjectReference>
    231     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    232       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    233       <Name>HeuristicLab.Core.Views-3.3</Name>
    234       <Private>False</Private>
    235     </ProjectReference>
    236     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    237       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    238       <Name>HeuristicLab.Core-3.3</Name>
    239       <Private>False</Private>
    240     </ProjectReference>
    241     <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    242       <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    243       <Name>HeuristicLab.Data.Views-3.3</Name>
    244       <Private>False</Private>
    245     </ProjectReference>
    246     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    247       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    248       <Name>HeuristicLab.Data-3.3</Name>
    249       <Private>False</Private>
    250     </ProjectReference>
    251     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj">
    252       <Project>{6F42C5F8-16CD-43EE-8208-FD4573A69D85}</Project>
    253       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3</Name>
    254       <Private>False</Private>
    255     </ProjectReference>
    256     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    257       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    258       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    259       <Private>False</Private>
    260     </ProjectReference>
    261     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    262       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    263       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    264       <Private>False</Private>
    265     </ProjectReference>
    266     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    267       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    268       <Name>HeuristicLab.MainForm-3.3</Name>
    269       <Private>False</Private>
    270     </ProjectReference>
    271     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    272       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    273       <Name>HeuristicLab.Operators-3.3</Name>
    274       <Private>False</Private>
    275     </ProjectReference>
    276     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    277       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    278       <Name>HeuristicLab.Optimization-3.3</Name>
    279       <Private>False</Private>
    280     </ProjectReference>
    281     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    282       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    283       <Name>HeuristicLab.Parameters-3.3</Name>
    284       <Private>False</Private>
    285     </ProjectReference>
    286     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    287       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    288       <Name>HeuristicLab.Persistence-3.3</Name>
    289       <Private>False</Private>
    290     </ProjectReference>
    291     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    292       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    293       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    294       <Private>False</Private>
    295     </ProjectReference>
    296     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
    297       <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
    298       <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
    299       <Private>False</Private>
    300     </ProjectReference>
    301     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    302       <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    303       <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
    304       <Private>False</Private>
    305     </ProjectReference>
    306     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    307       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    308       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    309       <Private>False</Private>
    310     </ProjectReference>
     221    <Reference Include="HeuristicLab.Collections-3.3">
     222      <HintPath>..\..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     223      <Private>False</Private>
     224    </Reference>
     225    <Reference Include="HeuristicLab.Common-3.3">
     226      <HintPath>..\..\bin\HeuristicLab.Common-3.3.dll</HintPath>
     227      <Private>False</Private>
     228    </Reference>
     229    <Reference Include="HeuristicLab.Core.Views-3.3">
     230      <HintPath>..\..\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     231      <Private>False</Private>
     232    </Reference>
     233    <Reference Include="HeuristicLab.Core-3.3">
     234      <HintPath>..\..\bin\HeuristicLab.Core-3.3.dll</HintPath>
     235      <Private>False</Private>
     236    </Reference>
     237    <Reference Include="HeuristicLab.Data.Views-3.3">
     238      <HintPath>..\..\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
     239      <Private>False</Private>
     240    </Reference>
     241    <Reference Include="HeuristicLab.Data-3.3">
     242      <HintPath>..\..\bin\HeuristicLab.Data-3.3.dll</HintPath>
     243      <Private>False</Private>
     244    </Reference>
     245    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
     246      <HintPath>..\..\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     247      <Private>False</Private>
     248    </Reference>
     249    <Reference Include="HeuristicLab.MainForm-3.3">
     250      <HintPath>..\..\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     251      <Private>False</Private>
     252    </Reference>
     253    <Reference Include="HeuristicLab.Operators-3.3">
     254      <HintPath>..\..\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     255      <Private>False</Private>
     256    </Reference>
     257    <Reference Include="HeuristicLab.Optimization-3.3">
     258      <HintPath>..\..\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     259      <Private>False</Private>
     260    </Reference>
     261    <Reference Include="HeuristicLab.Parameters-3.3">
     262      <HintPath>..\..\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     263      <Private>False</Private>
     264    </Reference>
     265    <Reference Include="HeuristicLab.Persistence-3.3">
     266      <HintPath>..\..\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     267      <Private>False</Private>
     268    </Reference>
     269    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     270      <HintPath>..\..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     271      <Private>False</Private>
     272    </Reference>
     273    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3">
     274      <HintPath>..\..\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     275      <Private>False</Private>
     276    </Reference>
    311277  </ItemGroup>
    312278  <ItemGroup>
    … …  
    326292      <Install>true</Install>
    327293    </BootstrapperPackage>
     294  </ItemGroup>
     295  <ItemGroup>
     296    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj">
     297      <Project>{6F42C5F8-16CD-43EE-8208-FD4573A69D85}</Project>
     298      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3</Name>
     299      <Private>False</Private>
     300    </ProjectReference>
     301    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
     302      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
     303      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     304      <Private>False</Private>
     305    </ProjectReference>
     306    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
     307      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
     308      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
     309      <Private>False</Private>
     310    </ProjectReference>
     311    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
     312      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
     313      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     314      <Private>False</Private>
     315    </ProjectReference>
    328316  </ItemGroup>
    329317  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

    r6982 r7215  
    2424using System.Linq;
    2525using System.Windows.Forms;
     26using HeuristicLab.Common;
    2627using HeuristicLab.Data;
    2728using HeuristicLab.MainForm;
    … …  
    9697
    9798      int classValuesCount = Content.ProblemData.ClassValues.Count;
    98       int modelCount = Content.Model.Models.Count();
    99       string[,] values = new string[indizes.Length, 5 + classValuesCount + modelCount];
     99      int solutionsCount = Content.ClassificationSolutions.Count();
     100      string[,] values = new string[indizes.Length, 5 + classValuesCount + solutionsCount];
    100101      double[] target = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray();
    101102      List<List<double?>> estimatedValuesVector = GetEstimatedValues(SamplesComboBox.SelectedItem.ToString(), indizes,
    … …  
    107108        values[i, 1] = target[i].ToString();
    108109        //display only indices and target values if no models are present
    109         if (i >= estimatedClassValues.Length) continue;
    110 
    111         values[i, 2] = estimatedClassValues[i].ToString();
    112         values[i, 3] = (target[i] == estimatedClassValues[i]).ToString();
    113         var groups = estimatedValuesVector[i].GroupBy(x => x).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
    114         var estimationCount = groups.Where(g => g.Key != null).Select(g => g.Count).Sum();
    115         values[i, 4] = (((double)groups.Where(g => g.Key == estimatedClassValues[i]).Single().Count) / estimationCount).ToString();
    116         for (int classIndex = 0; classIndex < Content.ProblemData.ClassValues.Count; classIndex++) {
    117           var group = groups.Where(g => g.Key == Content.ProblemData.ClassValues[classIndex]).SingleOrDefault();
    118           if (group == null) values[i, 5 + classIndex] = 0.ToString();
    119           else values[i, 5 + classIndex] = group.Count.ToString();
     110        if (solutionsCount > 0) {
     111          values[i, 2] = estimatedClassValues[i].ToString();
     112          values[i, 3] = (target[i].IsAlmost(estimatedClassValues[i])).ToString();
     113          var groups =
     114            estimatedValuesVector[i].GroupBy(x => x).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
     115          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();
     120            if (group == null) values[i, 5 + classIndex] = 0.ToString();
     121            else values[i, 5 + classIndex] = group.Count.ToString();
     122          }
     123          for (int modelIndex = 0; modelIndex < estimatedValuesVector[i].Count; modelIndex++) {
     124            values[i, 5 + classValuesCount + modelIndex] = estimatedValuesVector[i][modelIndex] == null
     125                                                             ? string.Empty
     126                                                             : estimatedValuesVector[i][modelIndex].ToString();
     127          }
    120128        }
    121         for (int modelIndex = 0; modelIndex < estimatedValuesVector[i].Count; modelIndex++) {
    122           values[i, 5 + classValuesCount + modelIndex] = estimatedValuesVector[i][modelIndex] == null
    123                                                            ? string.Empty
    124                                                            : estimatedValuesVector[i][modelIndex].ToString();
    125         }
    126 
    127129      }
    128130

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r6866 r7215  
    122122      <DependentUpon>ClassificationEnsembleSolutionModelView.cs</DependentUpon>
    123123    </Compile>
    124     <Compile Include="Plugin.cs" />
    125     <Compile Include="Solution Views\TimeSeriesPrognosisSolutionView.cs">
    126       <SubType>UserControl</SubType>
    127     </Compile>
    128     <Compile Include="Solution Views\TimeSeriesPrognosisSolutionView.Designer.cs">
    129       <DependentUpon>TimeSeriesPrognosisSolutionView.cs</DependentUpon>
    130     </Compile>
    131     <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.cs">
    132       <SubType>UserControl</SubType>
    133     </Compile>
    134     <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.Designer.cs">
    135       <DependentUpon>TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.cs</DependentUpon>
    136     </Compile>
    137     <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionLineChartView.cs">
    138       <SubType>UserControl</SubType>
    139     </Compile>
    140     <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionLineChartView.Designer.cs">
    141       <DependentUpon>TimeSeriesPrognosisSolutionLineChartView.cs</DependentUpon>
    142     </Compile>
    143     <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionPrognosedValuesView.cs">
    144       <SubType>UserControl</SubType>
    145     </Compile>
    146     <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionPrognosedValuesView.Designer.cs">
    147       <DependentUpon>TimeSeriesPrognosisSolutionPrognosedValuesView.cs</DependentUpon>
    148     </Compile>
    149     <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionScatterPlotView.cs">
    150       <SubType>UserControl</SubType>
    151     </Compile>
    152     <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionScatterPlotView.Designer.cs">
    153       <DependentUpon>TimeSeriesPrognosisSolutionScatterPlotView.cs</DependentUpon>
    154     </Compile>
    155124    <Compile Include="DataAnalysisSolutionEvaluationView.cs">
    156125      <SubType>UserControl</SubType>
    … …  
    159128      <DependentUpon>DataAnalysisSolutionEvaluationView.cs</DependentUpon>
    160129    </Compile>
     130    <Compile Include="Plugin.cs" />
    161131    <Compile Include="Regression\RegressionSolutionErrorCharacteristicsCurveView.cs">
    162132      <SubType>UserControl</SubType>

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.Designer.cs

    r6642 r7215  
    4949      this.chart.TabIndex = 0;
    5050      this.chart.Text = "chart";
     51      this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);
    5152      //
    5253      // label1

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

    r6982 r7215  
    3131  [Content(typeof(IRegressionSolution))]
    3232  public partial class RegressionSolutionErrorCharacteristicsCurveView : DataAnalysisSolutionEvaluationView {
     33    private IRegressionSolution constantModel;
    3334    protected const string TrainingSamples = "Training";
    3435    protected const string TestSamples = "Test";
    … …  
    101102      if (Content == null) return;
    102103
    103       var originalValues = GetOriginalValues();
    104       var meanModelEstimatedValues = GetMeanModelEstimatedValues(originalValues);
     104      var originalValues = GetOriginalValues().ToList();
     105      constantModel = CreateConstantModel();
     106      var meanModelEstimatedValues = GetEstimatedValues(constantModel);
    105107      var meanModelResiduals = GetResiduals(originalValues, meanModelEstimatedValues);
    106108
    … …  
    113115      UpdateSeries(meanModelResiduals, meanModelSeries);
    114116      meanModelSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(meanModelSeries);
     117      meanModelSeries.Tag = constantModel;
    115118      chart.Series.Add(meanModelSeries);
    116119
    … …  
    225228      else UpdateChart();
    226229    }
     230
     231    #region Mean Model
     232    private void chart_MouseDown(object sender, MouseEventArgs e) {
     233      if (e.Clicks < 2) return;
     234      HitTestResult result = chart.HitTest(e.X, e.Y);
     235      if (result.ChartElementType != ChartElementType.LegendItem) return;
     236      if (result.Series.Name != constantModel.Name) return;
     237
     238      MainFormManager.MainForm.ShowContent((IRegressionSolution)result.Series.Tag);
     239    }
     240
     241    private IRegressionSolution CreateConstantModel() {
     242      double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).Average();
     243      var solution = new ConstantRegressionModel(averageTrainingTarget).CreateRegressionSolution(ProblemData);
     244      solution.Name = "Mean Model";
     245      return solution;
     246    }
     247    #endregion
    227248  }
    228249}

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/ClassificationEnsembleSolutionView.cs

    r6666 r7215  
    3737    }
    3838
     39    protected override void OnContentChanged() {
     40      base.OnContentChanged();
     41      itemsListView.Items.Remove(itemsListView.FindItemWithText("Model: ClassificationEnsembleModel"));
     42    }
     43
    3944    #region drag & drop
    4045    protected override void itemsListView_DragDrop(object sender, DragEventArgs e) {

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionEnsembleSolutionView.cs

    r6666 r7215  
    3737    }
    3838
     39    protected override void OnContentChanged() {
     40      base.OnContentChanged();
     41      itemsListView.Items.Remove(itemsListView.FindItemWithText("Model: RegressionEnsembleModel"));
     42    }
     43
    3944    #region drag & drop
    4045    protected override void itemsListView_DragDrop(object sender, DragEventArgs e) {
Note: See TracChangeset for help on using the changeset viewer.