Ignore:
Timestamp:
10/02/13 17:04:43 (9 years ago)
Author:
gkronber
Message:

#1508: merged r9804:9805,r9808:9809,r9811:9812,r9822,r9824:9825,r9897,r9928,r9938:9941,r9964:9965,r9989,r9991:9992,r9995,r9997,r10004:10015 from trunk into stable branch.

Location:
stable
Files:
2 deleted
7 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Trading.Views/3.4/HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4.csproj

    r9799 r10020  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     43    <OutputPath>..\..\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>..\..\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     60    <OutputPath>..\..\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>..\..\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     78    <OutputPath>..\..\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>..\..\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="HeuristicLab.Collections-3.3">
    96       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    97     </Reference>
    98     <Reference Include="HeuristicLab.Common-3.3">
    99       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    100     </Reference>
    101     <Reference Include="HeuristicLab.Common.Resources-3.3">
    102       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    103     </Reference>
    104     <Reference Include="HeuristicLab.Core-3.3">
    105       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    106     </Reference>
    107     <Reference Include="HeuristicLab.Core.Views-3.3">
    108       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
    109     </Reference>
    110     <Reference Include="HeuristicLab.Data-3.3">
    111       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    112     </Reference>
    113     <Reference Include="HeuristicLab.MainForm-3.3">
    114       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
    115     </Reference>
    116     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    117       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Optimization-3.3">
    120       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    121     </Reference>
    122     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    123       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    124     </Reference>
    125     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    126       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    127     </Reference>
    128     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
    129       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
    130     </Reference>
    131     <Reference Include="HeuristicLab.Problems.DataAnalysis.Views-3.4">
    132       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Views-3.4.dll</HintPath>
    133     </Reference>
    134     <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3">
    135       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
    136     </Reference>
    13795    <Reference Include="System" />
    13896    <Reference Include="System.Core">
     
    156114    </Compile>
    157115    <Compile Include="SolutionView.Designer.cs">
    158       <DependentUpon>SolutionView.cs</DependentUpon>
    159     </Compile>
    160     <Compile Include="Symbolic\SolutionView.cs">
    161       <SubType>UserControl</SubType>
    162     </Compile>
    163     <Compile Include="Symbolic\SolutionView.Designer.cs">
    164116      <DependentUpon>SolutionView.cs</DependentUpon>
    165117    </Compile>
     
    186138    </BootstrapperPackage>
    187139  </ItemGroup>
    188   <ItemGroup>
    189     <Folder Include="Symbolic\Interfaces\" />
    190     <Folder Include="Symbolic\SingleObjective\" />
    191     <Folder Include="Symbolic\Views\" />
    192   </ItemGroup>
    193   <ItemGroup>
     140  <ItemGroup />
     141  <ItemGroup>
     142    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     143      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     144      <Name>HeuristicLab.Collections-3.3</Name>
     145      <Private>False</Private>
     146    </ProjectReference>
     147    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     148      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     149      <Name>HeuristicLab.Common.Resources-3.3</Name>
     150      <Private>False</Private>
     151    </ProjectReference>
     152    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     153      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     154      <Name>HeuristicLab.Common-3.3</Name>
     155      <Private>False</Private>
     156    </ProjectReference>
     157    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
     158      <Project>{e226881d-315f-423d-b419-a766fe0d8685}</Project>
     159      <Name>HeuristicLab.Core.Views-3.3</Name>
     160      <Private>False</Private>
     161    </ProjectReference>
     162    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     163      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     164      <Name>HeuristicLab.Core-3.3</Name>
     165      <Private>False</Private>
     166    </ProjectReference>
     167    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     168      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     169      <Name>HeuristicLab.Data-3.3</Name>
     170      <Private>False</Private>
     171    </ProjectReference>
     172    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     173      <Project>{ab687bbe-1bfe-476b-906d-44237135431d}</Project>
     174      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     175      <Private>False</Private>
     176    </ProjectReference>
     177    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     178      <Project>{3bd61258-31da-4b09-89c0-4f71fef5f05a}</Project>
     179      <Name>HeuristicLab.MainForm-3.3</Name>
     180      <Private>False</Private>
     181    </ProjectReference>
     182    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     183      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     184      <Name>HeuristicLab.Optimization-3.3</Name>
     185      <Private>False</Private>
     186    </ProjectReference>
     187    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     188      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     189      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     190      <Private>False</Private>
     191    </ProjectReference>
     192    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     193      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
     194      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     195      <Private>False</Private>
     196    </ProjectReference>
    194197    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Trading\3.4\HeuristicLab.Problems.DataAnalysis.Trading-3.4.csproj">
    195       <Project>{E4EE5AFB-D552-447B-8A16-6CBE7938AF32}</Project>
     198      <Project>{e4ee5afb-d552-447b-8a16-6cbe7938af32}</Project>
    196199      <Name>HeuristicLab.Problems.DataAnalysis.Trading-3.4</Name>
     200      <Private>False</Private>
     201    </ProjectReference>
     202    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
     203      <Project>{3e9e8944-44ff-40bb-a622-3a4a7dd0f198}</Project>
     204      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
     205      <Private>False</Private>
     206    </ProjectReference>
     207    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     208      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
     209      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     210      <Private>False</Private>
     211    </ProjectReference>
     212    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     213      <Project>{315bda09-3f4f-49b3-9790-b37cfc1c5750}</Project>
     214      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     215      <Private>False</Private>
    197216    </ProjectReference>
    198217  </ItemGroup>
     
    206225  -->
    207226  <PropertyGroup>
    208     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    209 set ProjectDir=$(ProjectDir)
    210 set SolutionDir=$(SolutionDir)
    211 set Outdir=$(Outdir)
     227    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     228      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     229      set ProjectDir=$(ProjectDir)
     230      set SolutionDir=$(SolutionDir)
     231      set Outdir=$(Outdir)
    212232
    213 call PreBuildEvent.cmd
    214 </PreBuildEvent>
     233      call PreBuildEvent.cmd
     234    </PreBuildEvent>
     235    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     236      export ProjectDir=$(ProjectDir)
     237      export SolutionDir=$(SolutionDir)
     238
     239      $SolutionDir/PreBuildEvent.sh
     240    </PreBuildEvent>
    215241  </PropertyGroup>
    216242</Project>
  • stable/HeuristicLab.Problems.DataAnalysis.Trading.Views/3.4/Plugin.cs.frame

    r9799 r10020  
    2626  [PluginFile("HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4.dll", PluginFileType.Assembly)]
    2727
    28   [PluginDependency("HeuristicLab.Collections", "3.3")]
    29   [PluginDependency("HeuristicLab.Common", "3.3")]
    3028  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    31   [PluginDependency("HeuristicLab.Core", "3.3")]
    3229  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    3330  [PluginDependency("HeuristicLab.Data", "3.3")]
    34   [PluginDependency("HeuristicLab.Data.Views", "3.3")]
    35   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
    3631  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3732  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    38   [PluginDependency("HeuristicLab.Operators", "3.3")]
    3933  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    40   [PluginDependency("HeuristicLab.Parameters", "3.3")]
    41   [PluginDependency("HeuristicLab.Persistence", "3.3")]
    4234  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    43   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
    4435  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views", "3.4")]
    45   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4636  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Trading", "3.4")]
    4737  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
  • stable/HeuristicLab.Problems.DataAnalysis.Trading.Views/3.4/Properties

    • Property svn:ignore set to
      AssemblyInfo.cs
  • stable/HeuristicLab.Problems.DataAnalysis.Trading.Views/3.4/SolutionLineChartView.cs

    r9796 r10020  
    5353      this.chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
    5454      this.chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
     55      this.chart.ChartAreas[0].AxisY.IntervalAutoMode = IntervalAutoMode.VariableCount;
     56      this.chart.ChartAreas[0].AxisY2.ScaleView.Zoomable = false;
     57      this.chart.ChartAreas[0].AxisY2.IntervalAutoMode = IntervalAutoMode.VariableCount;
     58      this.chart.ChartAreas[0].AxisY2.LabelStyle.Enabled = false;
     59      this.chart.ChartAreas[0].AxisY2.MajorGrid.Enabled = false;
     60      this.chart.ChartAreas[0].AxisY2.MinorGrid.Enabled = false;
     61      this.chart.ChartAreas[0].AxisY2.MajorTickMark.Enabled = false;
     62      this.chart.ChartAreas[0].AxisY2.MinorTickMark.Enabled = false;
    5563      this.chart.ChartAreas[0].CursorY.Interval = 0;
    5664    }
     
    5967      this.chart.Series.Clear();
    6068      if (Content != null) {
     69        var trainingRows = Content.ProblemData.TrainingIndices;
     70        var testRows = Content.ProblemData.TestIndices;
    6171        this.chart.Series.Add(SIGNALS_SERIES_NAME);
     72        this.chart.Series[SIGNALS_SERIES_NAME].YAxisType = AxisType.Secondary;
    6273        this.chart.Series[SIGNALS_SERIES_NAME].LegendText = SIGNALS_SERIES_NAME;
    6374        this.chart.Series[SIGNALS_SERIES_NAME].ChartType = SeriesChartType.FastLine;
    64         this.chart.Series[SIGNALS_SERIES_NAME].Points.DataBindY(Content.Signals.ToArray());
     75        this.chart.Series[SIGNALS_SERIES_NAME].Points.DataBindXY(
     76          trainingRows.Concat(testRows).ToArray(),
     77          Content.TrainingSignals.Concat(Content.TestSignals).ToArray());
    6578        this.chart.Series[SIGNALS_SERIES_NAME].Tag = Content;
    6679
    67         IEnumerable<double> accumulatedPrice = GetAccumulatedPrices(Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.PriceVariable));
     80        var trainingPriceChanges = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.PriceChangeVariable,
     81                                                                               trainingRows);
     82        var testPriceChanges = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.PriceChangeVariable,
     83                                                                               testRows);
     84        IEnumerable<double> accumulatedTrainingPrice = GetAccumulatedProfits(trainingPriceChanges);
     85        IEnumerable<double> accumulatedTestPrice = GetAccumulatedProfits(testPriceChanges);
    6886        this.chart.Series.Add(PRICEVARIABLE_SERIES_NAME);
     87        this.chart.Series[PRICEVARIABLE_SERIES_NAME].YAxisType = AxisType.Primary;
    6988        this.chart.Series[PRICEVARIABLE_SERIES_NAME].LegendText = PRICEVARIABLE_SERIES_NAME;
    7089        this.chart.Series[PRICEVARIABLE_SERIES_NAME].ChartType = SeriesChartType.FastLine;
    71         this.chart.Series[PRICEVARIABLE_SERIES_NAME].Points.DataBindY(accumulatedPrice.ToArray());
     90        this.chart.Series[PRICEVARIABLE_SERIES_NAME].Points.DataBindXY(
     91          trainingRows.Concat(testRows).ToArray(),
     92          accumulatedTrainingPrice.Concat(accumulatedTestPrice).ToArray());
    7293        this.chart.Series[PRICEVARIABLE_SERIES_NAME].Tag = Content;
    7394
    74         IEnumerable<double> profit = OnlineProfitCalculator.GetProfits(Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.PriceVariable), Content.Signals, Content.ProblemData.TransactionCosts);
    75         IEnumerable<double> accumulatedProfits = GetAccumulatedPrices(profit);
     95
     96        IEnumerable<double> trainingProfit = OnlineProfitCalculator.GetProfits(trainingPriceChanges, Content.TrainingSignals, Content.ProblemData.TransactionCosts);
     97        IEnumerable<double> testProfit = OnlineProfitCalculator.GetProfits(testPriceChanges, Content.TestSignals, Content.ProblemData.TransactionCosts);
     98        IEnumerable<double> accTrainingProfit = GetAccumulatedProfits(trainingProfit);
     99        IEnumerable<double> accTestProfit = GetAccumulatedProfits(testProfit);
    76100        this.chart.Series.Add(ASSET_SERIES_NAME);
     101        this.chart.Series[ASSET_SERIES_NAME].YAxisType = AxisType.Primary;
    77102        this.chart.Series[ASSET_SERIES_NAME].LegendText = ASSET_SERIES_NAME;
    78103        this.chart.Series[ASSET_SERIES_NAME].ChartType = SeriesChartType.FastLine;
    79         this.chart.Series[ASSET_SERIES_NAME].Points.DataBindY(accumulatedProfits.ToArray());
     104        this.chart.Series[ASSET_SERIES_NAME].Points.DataBindXY(
     105          trainingRows.Concat(testRows).ToArray(),
     106          accTrainingProfit.Concat(accTestProfit).ToArray());
    80107        this.chart.Series[ASSET_SERIES_NAME].Tag = Content;
    81108
     
    84111    }
    85112
    86     private IEnumerable<double> GetAccumulatedPrices(IEnumerable<double> xs) {
     113    private IEnumerable<double> GetAccumulatedProfits(IEnumerable<double> xs) {
    87114      double sum = 0;
    88115      foreach (var x in xs) {
  • stable/HeuristicLab.Problems.DataAnalysis.Trading.Views/3.4/SolutionView.Designer.cs

    r9796 r10020  
    5252      this.detailsGroupBox.SuspendLayout();
    5353      this.SuspendLayout();
     54      this.exportButton.Visible = false;
    5455      //
    5556      // splitContainer
     
    5859      // itemsGroupBox
    5960      //
    60       this.itemsGroupBox.Text = "Regression Solution";
     61      this.itemsGroupBox.Text = "Trading Solution";
    6162      //
    6263      // addButton
     
    7273      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    7374      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    74       this.Name = "RegressionSolutionView";
     75      this.Name = "TradingSolutionView";
    7576      this.splitContainer.Panel1.ResumeLayout(false);
    7677      this.splitContainer.Panel2.ResumeLayout(false);
  • stable/HeuristicLab.Problems.DataAnalysis.Trading.Views/3.4/SolutionView.cs

    r9796 r10020  
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Trading.Views {
    28   [View("TradingSolution View")]
     28  [View("Trading Solution View")]
    2929  [Content(typeof(Solution), true)]
    3030  public partial class SolutionView : DataAnalysisSolutionView {
     
    3232      InitializeComponent();
    3333
    34       var regressionSolutionEvaluationViewTypes = ApplicationManager.Manager.GetTypes(typeof(ISolutionEvaluationView), true);
    35       foreach (Type viewType in regressionSolutionEvaluationViewTypes)
     34      var solutionEvaluationViewTypes = ApplicationManager.Manager.GetTypes(typeof(ISolutionEvaluationView));
     35      foreach (Type viewType in solutionEvaluationViewTypes)
    3636        AddViewListViewItem(viewType, HeuristicLab.Common.Resources.VSImageLibrary.Graph);
    3737    }
Note: See TracChangeset for help on using the changeset viewer.