Free cookie consent management tool by TermsFeed Policy Generator

Changeset 9743


Ignore:
Timestamp:
07/24/13 11:50:18 (11 years ago)
Author:
gkronber
Message:

#1508 updated classes in trading branch to work with current trunk version of HL.

Location:
branches/HeuristicLab.Problems.DataAnalysis.Trading
Files:
2 deleted
32 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Calculators/OnlineProfitCalculator.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525
    26 namespace HeuristicLab.Problems.DataAnalysis {
     26namespace HeuristicLab.Problems.DataAnalysis.Trading {
    2727  public class OnlineProfitCalculator : IOnlineCalculator {
    2828
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Calculators/OnlineSharpeRatioCalculator.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525
    26 namespace HeuristicLab.Problems.DataAnalysis {
     26namespace HeuristicLab.Problems.DataAnalysis.Trading {
    2727  public class OnlineSharpeRatioCalculator : IOnlineCalculator {
    2828
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/HeuristicLab.Problems.DataAnalysis.Trading-3.4.csproj

    r9176 r9743  
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    96       <SpecificVersion>False</SpecificVersion>
    97       <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.6.0.dll</HintPath>
    98     </Reference>
    99     <Reference Include="HeuristicLab.Analysis-3.3">
    100       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll</HintPath>
    101     </Reference>
    10295    <Reference Include="HeuristicLab.Collections-3.3">
    10396      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     
    118111      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    119112    </Reference>
    120     <Reference Include="HeuristicLab.Data.Views-3.3">
    121       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll</HintPath>
    122     </Reference>
    123113    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
    124114      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    125115    </Reference>
    126     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4">
    127       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.dll</HintPath>
    128     </Reference>
    129116    <Reference Include="HeuristicLab.MainForm-3.3">
    130117      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     
    139126      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    140127    </Reference>
    141     <Reference Include="HeuristicLab.Optimization.Views-3.3">
    142       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    143     </Reference>
    144128    <Reference Include="HeuristicLab.Parameters-3.3">
    145129      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     
    157141      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
    158142    </Reference>
    159     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4">
    160       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll</HintPath>
    161     </Reference>
    162143    <Reference Include="HeuristicLab.Problems.DataAnalysis.Views-3.4">
    163144      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Views-3.4.dll</HintPath>
     
    165146    <Reference Include="HeuristicLab.Problems.Instances-3.3">
    166147      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    167     </Reference>
    168     <Reference Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3">
    169       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll</HintPath>
    170     </Reference>
    171     <Reference Include="HeuristicLab.Random-3.3">
    172       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
    173148    </Reference>
    174149    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3">
     
    182157    <Reference Include="System.Windows.Forms" />
    183158    <Reference Include="System.Windows.Forms.DataVisualization" />
    184     <Reference Include="System.Xml.Linq">
    185       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    186     </Reference>
    187     <Reference Include="System.Data.DataSetExtensions">
    188       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    189     </Reference>
    190     <Reference Include="System.Data" />
    191     <Reference Include="System.Xml" />
    192159  </ItemGroup>
    193160  <ItemGroup>
     
    200167    <Compile Include="Interfaces\ITradingSolution.cs" />
    201168    <Compile Include="Calculators\OnlineSharpeRatioCalculator.cs" />
    202     <Compile Include="CSVInstanceProvider.cs" />
    203169    <Compile Include="Symbolic\Interfaces\ISymbolicTradingEvaluator.cs" />
    204170    <Compile Include="Symbolic\Interfaces\ISymbolicTradingModel.cs" />
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/HeuristicLabProblemsDataAnalysisTradingPlugin.cs.frame

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Text;
    2522using HeuristicLab.PluginInfrastructure;
    2623
    2724namespace HeuristicLab.Problems.DataAnalysis.Trading {
    28   [Plugin("HeuristicLab.Problems.DataAnalysis.Trading","Provides classes to optimize trading rules (single- or multiobjective).", "3.4.0.$WCREV$")]
     25  [Plugin("HeuristicLab.Problems.DataAnalysis.Trading","Provides classes to optimize trading rules.", "3.4.0.$WCREV$")]
    2926  [PluginFile("HeuristicLab.Problems.DataAnalysis.Trading-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.6")]
    31   [PluginDependency("HeuristicLab.Analysis", "3.3")]
     27
     28  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3229  [PluginDependency("HeuristicLab.Common", "3.3")]
    33   [PluginDependency("HeuristicLab.Collections", "3.3")]
     30  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3431  [PluginDependency("HeuristicLab.Core", "3.3")]
     32  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    3533  [PluginDependency("HeuristicLab.Data", "3.3")]
     34  [PluginDependency("HeuristicLab.Data.Views", "3.3")]
    3635  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
     36  [PluginDependency("HeuristicLab.MainForm", "3.3")]
     37  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    3738  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3839  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     
    4142  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4243  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
     44  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views", "3.4")]
     45  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
     46  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
    4347  public class HeuristicLabProblemsDataAnalysisSymbolicTradingPlugin : PluginBase {
    4448  }
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Interfaces/ITradingEnsembleModel.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2121
    2222using System.Collections.Generic;
    23 namespace HeuristicLab.Problems.DataAnalysis {
     23namespace HeuristicLab.Problems.DataAnalysis.Trading {
    2424  public interface ITradingEnsembleModel : ITradingModel {
    2525    IEnumerable<ITradingModel> Models { get; }
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Interfaces/ITradingModel.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2121
    2222using System.Collections.Generic;
    23 namespace HeuristicLab.Problems.DataAnalysis {
     23namespace HeuristicLab.Problems.DataAnalysis.Trading {
    2424  public interface ITradingModel : IDataAnalysisModel {
    2525    IEnumerable<double> GetSignals(Dataset dataset, IEnumerable<int> rows);
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Interfaces/ITradingProblem.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis {
     22namespace HeuristicLab.Problems.DataAnalysis.Trading {
    2323  public interface ITradingProblem : IDataAnalysisProblem<ITradingProblemData> {
    2424  }
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Interfaces/ITradingProblemData.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis {
     22namespace HeuristicLab.Problems.DataAnalysis.Trading {
    2323  public interface ITradingProblemData : IDataAnalysisProblemData {
    2424    string PriceVariable { get; }
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Interfaces/ITradingSolution.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2121
    2222using System.Collections.Generic;
    23 namespace HeuristicLab.Problems.DataAnalysis {
     23namespace HeuristicLab.Problems.DataAnalysis.Trading {
    2424  public interface ITradingSolution : IDataAnalysisSolution {
    2525    new ITradingModel Model { get; }
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Properties/AssemblyInfo.cs.frame

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3131[assembly: AssemblyCompany("")]
    3232[assembly: AssemblyProduct("HeuristicLab")]
    33 [assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
    3434[assembly: AssemblyTrademark("")]
    3535[assembly: AssemblyCulture("")]
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Interfaces/ISymbolicTradingEvaluator.cs

    r6126 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
     22using HeuristicLab.Problems.DataAnalysis.Trading;
    2223
    2324namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Interfaces/ISymbolicTradingModel.cs

    r6126 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
     22using HeuristicLab.Problems.DataAnalysis.Trading;
     23
    2324namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
    2425  public interface ISymbolicTradingModel : ITradingModel, ISymbolicDataAnalysisModel {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Interfaces/ISymbolicTradingSingleObjectiveEvaluator.cs

    r6126 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
     22using HeuristicLab.Problems.DataAnalysis.Trading;
     23
    2224namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
    2325  public interface ISymbolicTradingSingleObjectiveEvaluator : ISymbolicTradingEvaluator, ISymbolicDataAnalysisSingleObjectiveEvaluator<ITradingProblemData> {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Interfaces/ISymbolicTradingSolution.cs

    r6126 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2121
    2222
    23 using HeuristicLab.Problems.DataAnalysis.Symbolic;
     23using HeuristicLab.Problems.DataAnalysis.Trading;
     24
    2425namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
    2526  public interface ISymbolicTradingSolution : ITradingSolution, ISymbolicDataAnalysisSolution {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SymbolicTradingSingleObjectiveEvaluator.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Problems.DataAnalysis.Trading;
     26
    2527namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
    2628  public abstract class SymbolicTradingSingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator<ITradingProblemData>, ISymbolicTradingSingleObjectiveEvaluator {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SymbolicTradingSingleObjectiveProblem.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using System.Linq;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Core;
    25 using HeuristicLab.Parameters;
    2624using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Problems.DataAnalysis.Trading;
    2726
    2827namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
     
    5352      ParameterizeOperators();
    5453    }
    55 
    56     protected override void ParameterizeOperators() {
    57       base.ParameterizeOperators();
    58     }
    59 
    60     //public override void ImportProblemDataFromFile(string fileName) {
    61     //  TradingProblemData problemData = TradingProblemData.ImportFromFile(fileName);
    62     //  ProblemData = problemData;
    63     //}
    6454  }
    6555}
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SymbolicTradingSingleObjectiveSharpeRatioEvaluator.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
     22using System.Collections.Generic;
    2223using System.Linq;
    23 using System.Collections.Generic;
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
     
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Parameters;
     29using HeuristicLab.Problems.DataAnalysis.Trading;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SymbolicTradingSingleObjectiveTrainingBestSolutionAnalyzer.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Data;
    2524using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2625using HeuristicLab.Parameters;
    2726using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Problems.DataAnalysis.Trading;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SymbolicTradingSingleObjectiveValidationBestSolutionAnalyzer.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Data;
    2524using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Parameters;
    2725using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Problems.DataAnalysis.Trading;
    2827
    2928namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SymbolicTradingModel.cs

    r9213 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
     22using System.Collections.Generic;
    2223using System.Linq;
    23 using System.Collections.Generic;
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
     
    4040      : base(original, cloner) { }
    4141    public SymbolicTradingModel(ISymbolicExpressionTree tree, ISymbolicDataAnalysisExpressionTreeInterpreter interpreter)
    42       : base(tree, interpreter) { }
     42      : base(tree, interpreter, -10, 10) { }
    4343
    4444    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SymbolicTradingSolution.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Core;
     
    2625using HeuristicLab.Optimization;
    2726using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Problems.DataAnalysis.Trading;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Views/SymbolicTradingSolutionView.Designer.cs

    r6126 r9743  
    1 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading.Views {
    223  partial class SymbolicTradingSolutionView {
    324    /// <summary>
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Views/SymbolicTradingSolutionView.cs

    r6126 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using System;
    2322using System.Windows.Forms;
    2423using HeuristicLab.MainForm;
    25 using HeuristicLab.Problems.DataAnalysis.Views;
     24using HeuristicLab.Problems.DataAnalysis.Trading.Views;
    2625
    2726namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Trading.Views {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/TradingEnsembleModel.cs

    r6125 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.DataAnalysis {
     28namespace HeuristicLab.Problems.DataAnalysis.Trading {
    2929  /// <summary>
    3030  /// Represents trading solutions that contain an ensemble of multiple trading models
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/TradingProblem.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.Instances;
    2625
    27 namespace HeuristicLab.Problems.DataAnalysis {
     26namespace HeuristicLab.Problems.DataAnalysis.Trading {
    2827  [StorableClass]
    2928  [Item("Trading Problem", "A general trading problem.")]
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/TradingProblemData.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2222using System;
    2323using System.Collections.Generic;
    24 using System.IO;
    2524using System.Linq;
    2625using HeuristicLab.Common;
     
    2928using HeuristicLab.Parameters;
    3029using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    31 using HeuristicLab.Problems.Instances;
    32 using HeuristicLab.Problems.Instances.DataAnalysis;
    3330
    34 namespace HeuristicLab.Problems.DataAnalysis {
     31namespace HeuristicLab.Problems.DataAnalysis.Trading {
    3532  [StorableClass]
    3633  [Item("TradingProblemData", "Represents an item containing all data defining a trading problem.")]
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/TradingSolution.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
     
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2928
    30 namespace HeuristicLab.Problems.DataAnalysis {
     29namespace HeuristicLab.Problems.DataAnalysis.Trading {
    3130  /// <summary>
    3231  /// Abstract base class for trading data analysis solutions
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Views/ITradingSolutionEvaluationView.cs

    r6127 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
     22using HeuristicLab.Problems.DataAnalysis.Trading;
    2223
    2324namespace HeuristicLab.Problems.DataAnalysis.Views {
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Views/TradingSolutionLineChartView.Designer.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    1919 */
    2020#endregion
    21 namespace HeuristicLab.Problems.DataAnalysis.Views {
     21namespace HeuristicLab.Problems.DataAnalysis.Trading.Views {
    2222  partial class TradingSolutionLineChartView {
    2323    /// <summary>
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Views/TradingSolutionLineChartView.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121using System;
     22using System.Collections.Generic;
    2223using System.Drawing;
    2324using System.Linq;
     
    2526using System.Windows.Forms.DataVisualization.Charting;
    2627using HeuristicLab.Common;
    27 using HeuristicLab.Core.Views;
    2828using HeuristicLab.MainForm;
    2929using HeuristicLab.MainForm.WindowsForms;
    30 using System.Collections.Generic;
    31 
    32 namespace HeuristicLab.Problems.DataAnalysis.Views {
     30using HeuristicLab.Problems.DataAnalysis.Views;
     31
     32namespace HeuristicLab.Problems.DataAnalysis.Trading.Views {
    3333  [View("Line Chart")]
    3434  [Content(typeof(ITradingSolution))]
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Views/TradingSolutionView.Designer.cs

    r6123 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Views {
     22namespace HeuristicLab.Problems.DataAnalysis.Trading.Views {
    2323  partial class TradingSolutionView {
    2424    /// <summary>
  • branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Views/TradingSolutionView.cs

    r9176 r9743  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2121
    2222using System;
    23 using System.Windows.Forms;
    2423using HeuristicLab.MainForm;
    2524using HeuristicLab.PluginInfrastructure;
     25using HeuristicLab.Problems.DataAnalysis.Views;
    2626
    27 namespace HeuristicLab.Problems.DataAnalysis.Views {
     27namespace HeuristicLab.Problems.DataAnalysis.Trading.Views {
    2828  [View("TradingSolution View")]
    2929  [Content(typeof(TradingSolution), true)]
Note: See TracChangeset for help on using the changeset viewer.