Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/08/12 14:04:17 (12 years ago)
Author:
mkommend
Message:

#1081: Intermediate commit of trunk updates - interpreter changes must be redone.

Location:
branches/HeuristicLab.TimeSeries
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.TimeSeries

    • Property svn:ignore
      •  

        old new  
        2020bin
        2121protoc.exe
         22_ReSharper.HeuristicLab.TimeSeries-3.3
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Viewsmergedeligible
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Viewsmergedeligible
      /trunk/sources/HeuristicLab.Problems.DataAnalysis.Viewsmergedeligible
      /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Views6917-7005
      /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Views4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Views5815-6180
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views6284-6795
      /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Views5138-5162
      /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Views5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Views6828
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Views5370-5682
      /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Views6829-6865
      /branches/VNS/HeuristicLab.Problems.DataAnalysis.Views5594-5752
      /branches/histogram/HeuristicLab.Problems.DataAnalysis.Views5959-6341
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionScatterPlotView.cs

    r7268 r8430  
    119119      this.chart.ChartAreas[0].CursorX.Interval = zoomInterval;
    120120      this.chart.ChartAreas[0].CursorY.Interval = zoomInterval;
     121
     122      this.chart.ChartAreas[0].AxisX.ScaleView.SmallScrollSize = zoomInterval;
     123      this.chart.ChartAreas[0].AxisY.ScaleView.SmallScrollSize = zoomInterval;
     124
     125      this.chart.ChartAreas[0].AxisX.ScaleView.SmallScrollMinSizeType = DateTimeIntervalType.Number;
     126      this.chart.ChartAreas[0].AxisX.ScaleView.SmallScrollMinSize = zoomInterval;
     127      this.chart.ChartAreas[0].AxisY.ScaleView.SmallScrollMinSizeType = DateTimeIntervalType.Number;
     128      this.chart.ChartAreas[0].AxisY.ScaleView.SmallScrollMinSize = zoomInterval;
     129
     130      if (digits < 0) {
     131        this.chart.ChartAreas[0].AxisX.LabelStyle.Format = "F" + (int)Math.Abs(digits);
     132        this.chart.ChartAreas[0].AxisY.LabelStyle.Format = "F" + (int)Math.Abs(digits);
     133      } else {
     134        this.chart.ChartAreas[0].AxisX.LabelStyle.Format = "F0";
     135        this.chart.ChartAreas[0].AxisY.LabelStyle.Format = "F0";
     136      }
    121137    }
    122138
     
    132148        if (this.chart.Series[TRAINING_SERIES].Points.Count > 0)
    133149          this.chart.Series[TRAINING_SERIES].Points.DataBindXY(Content.EstimatedTrainingValues.ToArray(), "",
    134             dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TrainingIndizes).ToArray(), "");
     150            dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TrainingIndices).ToArray(), "");
    135151        if (this.chart.Series[TEST_SERIES].Points.Count > 0)
    136152          this.chart.Series[TEST_SERIES].Points.DataBindXY(Content.EstimatedTestValues.ToArray(), "",
    137            dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TestIndizes).ToArray(), "");
     153           dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TestIndices).ToArray(), "");
    138154
    139155        double max = Content.EstimatedTrainingValues.Concat(Content.EstimatedTestValues.Concat(Content.EstimatedValues.Concat(dataset.GetDoubleValues(targetVariableName)))).Max();
     
    180196          case TRAINING_SERIES:
    181197            predictedValues = Content.EstimatedTrainingValues.ToArray();
    182             targetValues = Content.ProblemData.Dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TrainingIndizes).ToArray();
     198            targetValues = Content.ProblemData.Dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TrainingIndices).ToArray();
    183199            break;
    184200          case TEST_SERIES:
    185201            predictedValues = Content.EstimatedTestValues.ToArray();
    186             targetValues = Content.ProblemData.Dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TestIndizes).ToArray();
     202            targetValues = Content.ProblemData.Dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TestIndices).ToArray();
    187203            break;
    188204        }
Note: See TracChangeset for help on using the changeset viewer.