Changeset 14547


Ignore:
Timestamp:
01/05/17 15:59:47 (3 years ago)
Author:
jzenisek
Message:

#2719 added type and view for representing dictionary<string,double> as bar chart (implementation in progress)

Location:
branches/HeuristicLab.DatastreamAnalysis
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/HeuristicLab.DatastreamAnalysis.Views.csproj

    r14538 r14547  
    5151      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    5252    </Reference>
     53    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     54      <SpecificVersion>False</SpecificVersion>
     55      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     56    </Reference>
    5357    <Reference Include="HeuristicLab.Core-3.3">
    5458      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     
    7781      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    7882    </Reference>
     83    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     84      <SpecificVersion>False</SpecificVersion>
     85      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     86    </Reference>
    7987    <Reference Include="System" />
    8088    <Reference Include="System.Core" />
     89    <Reference Include="System.Windows.Forms.DataVisualization" />
    8190    <Reference Include="System.Xml.Linq" />
    8291    <Reference Include="System.Data.DataSetExtensions" />
     
    9099  </ItemGroup>
    91100  <ItemGroup>
     101    <Compile Include="DataBarSetView.cs">
     102      <SubType>UserControl</SubType>
     103    </Compile>
     104    <Compile Include="DataBarSetView.Designer.cs">
     105      <DependentUpon>DataBarSetView.cs</DependentUpon>
     106    </Compile>
    92107    <Compile Include="DatastreamAnalysisOptimizerView.cs">
    93108      <SubType>UserControl</SubType>
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Plugin.cs

    r14543 r14547  
    2323
    2424namespace HeuristicLab.DatastreamAnalysis.Views {
    25   [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.14538")]
     25  [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.14543")]
    2626  [PluginFile("HeuristicLab.DatastreamAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Properties/AssemblyInfo.cs

    r14543 r14547  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.4.0.0")]
    56 [assembly: AssemblyFileVersion("3.4.14.14538")]
     56[assembly: AssemblyFileVersion("3.4.14.14543")]
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/DatastreamAnalysisOptimizer.cs

    r14543 r14547  
    157157    private const string ResultsTargetsReal = "Real";
    158158
    159     private DataTable ResultsQualitiesBars {
    160       get { return ((DataTable) Results["Ensembles"].Value); }
     159    private DataBarSet ResultsQualitiesBars {
     160      get { return (DataBarSet) Results["Ensemble"].Value; }
    161161    }
    162162
     
    167167      Results.Add(new Result("Qualities", new DataTable("Qualities")));
    168168      Results.Add(new Result("Targets", new DataTable("Targets")));
    169 
    170       ResultsQualitiesBars.Rows.Add(new DataRow("Ensembles"));
     169      Results.Add(new Result("Ensemble Comparison", new DataBarSet("Ensemble Comparison")));
    171170
    172171      ResultsTargets.Rows.Add(new DataRow(ResultsTargetsReal));
     
    180179
    181180        // qualities (bars)
    182         //ResultsQualitiesBars.Rows.Add(new DataRow(ensemble.Name + " - " + ResultsQualitiesPR2));
    183         //ResultsQualitiesBars.Rows["Ensembles"].Values.
     181        ResultsQualitiesBars.Bars.Add(new StringValue(ensemble.Name), new DoubleValue(0.0));
    184182      }
    185183    }
     
    437435        var pR2 = error == OnlineCalculatorError.None ? pR * pR : 0.0;
    438436
    439         DataRow qualitiesBarsRow = ResultsQualitiesBars.Rows[ensemble.Name + " - " + ResultsQualitiesPR2];
    440 
    441437        for (int i = replayedIndex; i < Datastream.FitnessPartition.End; i++) {
    442438          ResultsTargets.Rows[ensemble.Name].Values.Add(averageEstimatedValue);
     
    444440          //ResultsQualities.Rows[ensemble.Name + " - " + ResultsQualitiesMSE].Values.Add(mse);
    445441          ResultsQualities.Rows[ensemble.Name + " - " + ResultsQualitiesPR2].Values.Add(pR2);
     442          ResultsQualitiesBars.Bars[new StringValue(ensemble.ItemName)].Value = pR2;
     443          ResultsQualitiesBars.Bars[new StringValue(ensemble.ItemName)] = new DoubleValue(pR2);
     444          //ResultsQualitiesBars.Bars[new StringValue(ensemble.ItemName)]
    446445        }
    447446      }
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/HeuristicLab.DatastreamAnalysis.csproj

    r14536 r14547  
    103103  <ItemGroup>
    104104    <Compile Include="AnalysisBase.cs" />
     105    <Compile Include="DataBarSet.cs" />
    105106    <Compile Include="Datastream.cs" />
    106107    <Compile Include="DatastreamAnalysisOptimizer.cs" />
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Plugin.cs

    r14543 r14547  
    2323
    2424namespace HeuristicLab.DatastreamAnalysis {
    25   [Plugin("HeuristicLab.DatastreamAnalysis", "3.4.14.14538")]
     25  [Plugin("HeuristicLab.DatastreamAnalysis", "3.4.14.14543")]
    2626  [PluginFile("HeuristicLab.DatastreamAnalysis-3.4.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Properties/AssemblyInfo.cs

    r14543 r14547  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.4.0.0")]
    56 [assembly: AssemblyFileVersion("3.4.14.14538")]
     56[assembly: AssemblyFileVersion("3.4.14.14543")]
Note: See TracChangeset for help on using the changeset viewer.