Changeset 7843


Ignore:
Timestamp:
05/16/12 16:58:16 (8 years ago)
Author:
gkronber
Message:

#1081: fixed compile errors after merging changes from the trunk

Location:
branches/HeuristicLab.TimeSeries
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.csproj

    r7461 r7843  
    188188      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    189189    </ProjectReference>
     190    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     191      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     192      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     193    </ProjectReference>
    190194    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    191195      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/Interfaces/ISymbolicTimeSeriesPrognosisModel.cs

    r7463 r7843  
    2222namespace HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis {
    2323  public interface ISymbolicTimeSeriesPrognosisModel : ITimeSeriesPrognosisModel, ISymbolicDataAnalysisModel {
    24     ISymbolicTimeSeriesPrognosisExpressionTreeInterpreter Interpreter { get; }
     24    new ISymbolicTimeSeriesPrognosisExpressionTreeInterpreter Interpreter { get; }
    2525  }
    2626}
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/Plugin.cs.frame

    r7463 r7843  
    3939  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    4040  [PluginDependency("HeuristicLab.Persistence", "3.3")]
     41  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4142  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4243  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectiveProblem.cs

    r7183 r7843  
    108108    }
    109109
    110     public override void ImportProblemDataFromFile(string fileName) {
    111       TimeSeriesPrognosisProblemData problemData = TimeSeriesPrognosisProblemData.ImportFromFile(fileName);
    112       ProblemData = problemData;
    113     }
    114110  }
    115111}
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs

    r7842 r7843  
    6767    private static MethodInfo bessel = thisType.GetMethod("Bessel", new Type[] { typeof(double) });
    6868
    69     internal delegate double CompiledFunction(int sampleIndex, IList<double>[] columns);
     69   
    7070
    7171    private const string CheckExpressionsWithIntervalArithmeticParameterName = "CheckExpressionsWithIntervalArithmetic";
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs

    r7842 r7843  
    366366          }
    367367        case OpCodes.Square: {
    368             return Math.Pow(Evaluate(dataset, ref row, state), 2);
     368            return Math.Pow(Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues), 2);
    369369          }
    370370        case OpCodes.Power: {
     
    374374          }
    375375        case OpCodes.SquareRoot: {
    376             return Math.Sqrt(Evaluate(dataset, ref row, state));
     376            return Math.Sqrt(Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues));
    377377          }
    378378        case OpCodes.Root: {
     
    388388          }
    389389        case OpCodes.Gamma: {
    390             var x = Evaluate(dataset, ref row, state);
     390            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    391391            if (double.IsNaN(x)) return double.NaN;
    392392            else return alglib.gammafunction(x);
    393393          }
    394394        case OpCodes.Psi: {
    395             var x = Evaluate(dataset, ref row, state);
     395            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    396396            if (double.IsNaN(x)) return double.NaN;
    397397            else if (x.IsAlmost(0.0)) return double.NaN;
     
    400400          }
    401401        case OpCodes.Dawson: {
    402             var x = Evaluate(dataset, ref row, state);
     402            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    403403            if (double.IsNaN(x)) return double.NaN;
    404404            return alglib.dawsonintegral(x);
    405405          }
    406406        case OpCodes.ExponentialIntegralEi: {
    407             var x = Evaluate(dataset, ref row, state);
     407            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    408408            if (double.IsNaN(x)) return double.NaN;
    409409            return alglib.exponentialintegralei(x);
     
    411411        case OpCodes.SineIntegral: {
    412412            double si, ci;
    413             var x = Evaluate(dataset, ref row, state);
     413            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    414414            if (double.IsNaN(x)) return double.NaN;
    415415            else {
     
    420420        case OpCodes.CosineIntegral: {
    421421            double si, ci;
    422             var x = Evaluate(dataset, ref row, state);
     422            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    423423            if (double.IsNaN(x)) return double.NaN;
    424424            else {
     
    429429        case OpCodes.HyperbolicSineIntegral: {
    430430            double shi, chi;
    431             var x = Evaluate(dataset, ref row, state);
     431            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    432432            if (double.IsNaN(x)) return double.NaN;
    433433            else {
     
    438438        case OpCodes.HyperbolicCosineIntegral: {
    439439            double shi, chi;
    440             var x = Evaluate(dataset, ref row, state);
     440            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    441441            if (double.IsNaN(x)) return double.NaN;
    442442            else {
     
    447447        case OpCodes.FresnelCosineIntegral: {
    448448            double c = 0, s = 0;
    449             var x = Evaluate(dataset, ref row, state);
     449            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    450450            if (double.IsNaN(x)) return double.NaN;
    451451            else {
     
    456456        case OpCodes.FresnelSineIntegral: {
    457457            double c = 0, s = 0;
    458             var x = Evaluate(dataset, ref row, state);
     458            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    459459            if (double.IsNaN(x)) return double.NaN;
    460460            else {
     
    465465        case OpCodes.AiryA: {
    466466            double ai, aip, bi, bip;
    467             var x = Evaluate(dataset, ref row, state);
     467            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    468468            if (double.IsNaN(x)) return double.NaN;
    469469            else {
     
    474474        case OpCodes.AiryB: {
    475475            double ai, aip, bi, bip;
    476             var x = Evaluate(dataset, ref row, state);
     476            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    477477            if (double.IsNaN(x)) return double.NaN;
    478478            else {
     
    482482          }
    483483        case OpCodes.Norm: {
    484             var x = Evaluate(dataset, ref row, state);
     484            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    485485            if (double.IsNaN(x)) return double.NaN;
    486486            else return alglib.normaldistribution(x);
    487487          }
    488488        case OpCodes.Erf: {
    489             var x = Evaluate(dataset, ref row, state);
     489            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    490490            if (double.IsNaN(x)) return double.NaN;
    491491            else return alglib.errorfunction(x);
    492492          }
    493493        case OpCodes.Bessel: {
    494             var x = Evaluate(dataset, ref row, state);
     494            var x = Evaluate(dataset, ref row, lastObservedRow, state, cachedPrognosedValues);
    495495            if (double.IsNaN(x)) return double.NaN;
    496496            else return alglib.besseli0(x);
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r7842 r7843  
    193193    <Compile Include="OnlineCalculators\OnlineTheilsUStatisticCalculator.cs" />
    194194    <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
    195     <Compile Include="TableFileParser.cs" />
    196195    <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
    197196    <Compile Include="Implementation\Classification\ThresholdCalculators\NormalDistributionCutPointsThresholdCalculator.cs" />
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblem.cs

    r6802 r7843  
    3939    }
    4040
    41     public override void ImportProblemDataFromFile(string fileName) {
    42       TimeSeriesPrognosisProblemData problemData = TimeSeriesPrognosisProblemData.ImportFromFile(fileName);
    43       ProblemData = problemData;
    44     }
    4541  }
    4642}
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

    r7100 r7843  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Globalization;
    2425using System.IO;
    2526using System.Linq;
     
    2930using HeuristicLab.Parameters;
    3031using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HeuristicLab.Problems.Instances;
    3133
    3234namespace HeuristicLab.Problems.DataAnalysis {
     
    16181620    public static TimeSeriesPrognosisProblemData ImportFromFile(string fileName) {
    16191621      TableFileParser csvFileParser = new TableFileParser();
    1620       csvFileParser.Parse(fileName);
     1622      csvFileParser.Parse(fileName, NumberFormatInfo.InvariantInfo, DateTimeFormatInfo.InvariantInfo, ',');
    16211623
    16221624      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
Note: See TracChangeset for help on using the changeset viewer.