Changeset 14421


Ignore:
Timestamp:
11/26/16 21:47:10 (3 years ago)
Author:
gkronber
Message:

#2650: merged r14405:14418 from trunk to branch

Location:
branches/symbreg-factors-2650
Files:
19 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/symbreg-factors-2650

  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views

  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj

    r14401 r14421  
    9898  <ItemGroup>
    9999    <Compile Include="DataPreprocessingMenuItem.cs" />
    100     <Compile Include="PreprocessingChartView.cs">
    101       <SubType>UserControl</SubType>
    102     </Compile>
     100    <Compile Include="PreprocessingFeatureCorrelationView.cs">
     101      <SubType>UserControl</SubType>
     102    </Compile>
     103    <Compile Include="PreprocessingFeatureCorrelationView.Designer.cs">
     104      <DependentUpon>PreprocessingFeatureCorrelationView.cs</DependentUpon>
     105    </Compile>
     106    <Compile Include="CheckedFilterCollectionView.cs">
     107      <SubType>UserControl</SubType>
     108    </Compile>
     109    <Compile Include="CheckedFilterCollectionView.Designer.cs">
     110      <DependentUpon>CheckedFilterCollectionView.cs</DependentUpon>
     111    </Compile>
     112    <Compile Include="CheckedTransformationListView.cs">
     113      <SubType>UserControl</SubType>
     114    </Compile>
     115    <Compile Include="CheckedTransformationListView.Designer.cs">
     116      <DependentUpon>CheckedTransformationListView.cs</DependentUpon>
     117    </Compile>
     118    <Compile Include="ComparisonFilterView.cs">
     119      <SubType>UserControl</SubType>
     120    </Compile>
     121    <Compile Include="ComparisonFilterView.Designer.cs">
     122      <DependentUpon>ComparisonFilterView.cs</DependentUpon>
     123    </Compile>
     124    <Compile Include="RenameColumnsDialog.cs">
     125      <SubType>Form</SubType>
     126    </Compile>
     127    <Compile Include="RenameColumnsDialog.Designer.cs">
     128      <DependentUpon>RenameColumnsDialog.cs</DependentUpon>
     129    </Compile>
     130    <Compile Include="ScatterPlotSingleView.cs">
     131      <SubType>UserControl</SubType>
     132    </Compile>
     133    <Compile Include="ScatterPlotSingleView.Designer.cs">
     134      <DependentUpon>ScatterPlotSingleView.cs</DependentUpon>
     135    </Compile>
     136    <Compile Include="DataCompletenessView.cs">
     137      <SubType>UserControl</SubType>
     138    </Compile>
     139    <Compile Include="DataCompletenessView.Designer.cs">
     140      <DependentUpon>DataCompletenessView.cs</DependentUpon>
     141    </Compile>
     142    <Compile Include="DataGridContentView.cs">
     143      <SubType>UserControl</SubType>
     144    </Compile>
     145    <Compile Include="DataGridContentView.Designer.cs">
     146      <DependentUpon>DataGridContentView.cs</DependentUpon>
     147    </Compile>
     148    <Compile Include="DataPreprocessingView.cs">
     149      <SubType>UserControl</SubType>
     150    </Compile>
     151    <Compile Include="DataPreprocessingView.designer.cs">
     152      <DependentUpon>DataPreprocessingView.cs</DependentUpon>
     153    </Compile>
     154    <Compile Include="DataPreprocessorStarter.cs" />
     155    <Compile Include="PreprocessingDataTableView.cs">
     156      <SubType>UserControl</SubType>
     157    </Compile>
     158    <Compile Include="PreprocessingDataTableView.Designer.cs">
     159      <DependentUpon>PreprocessingDataTableView.cs</DependentUpon>
     160    </Compile>
     161    <Compile Include="FilterView.cs">
     162      <SubType>UserControl</SubType>
     163    </Compile>
     164    <Compile Include="FilterView.Designer.cs">
     165      <DependentUpon>FilterView.cs</DependentUpon>
     166    </Compile>
     167    <Compile Include="ScatterPlotMultiView.cs" />
     168    <Compile Include="ScatterPlotMultiView.Designer.cs">
     169      <DependentUpon>ScatterPlotMultiView.cs</DependentUpon>
     170    </Compile>
     171    <Compile Include="PreprocessingScatterPlotView.cs">
     172      <SubType>UserControl</SubType>
     173    </Compile>
     174    <Compile Include="PreprocessingScatterPlotView.Designer.cs">
     175      <DependentUpon>PreprocessingScatterPlotView.cs</DependentUpon>
     176    </Compile>
     177    <Compile Include="SearchAndReplaceDialog.cs">
     178      <SubType>Form</SubType>
     179    </Compile>
     180    <Compile Include="SearchAndReplaceDialog.Designer.cs">
     181      <DependentUpon>SearchAndReplaceDialog.cs</DependentUpon>
     182    </Compile>
     183    <Compile Include="HistogramView.cs" />
     184    <Compile Include="HistogramView.Designer.cs">
     185      <DependentUpon>HistogramView.cs</DependentUpon>
     186    </Compile>
     187    <Compile Include="LineChartView.cs" />
     188    <Compile Include="LineChartView.Designer.cs">
     189      <DependentUpon>LineChartView.cs</DependentUpon>
     190    </Compile>
     191    <Compile Include="ManipulationView.cs">
     192      <SubType>UserControl</SubType>
     193    </Compile>
     194    <Compile Include="ManipulationView.Designer.cs">
     195      <DependentUpon>ManipulationView.cs</DependentUpon>
     196    </Compile>
     197    <Compile Include="Plugin.cs" />
     198    <Compile Include="PreprocessingChartView.cs" />
    103199    <Compile Include="PreprocessingChartView.Designer.cs">
    104200      <DependentUpon>PreprocessingChartView.cs</DependentUpon>
    105     </Compile>
    106     <Compile Include="PreprocessingFeatureCorrelationView.cs">
    107       <SubType>UserControl</SubType>
    108     </Compile>
    109     <Compile Include="PreprocessingFeatureCorrelationView.Designer.cs">
    110       <DependentUpon>PreprocessingFeatureCorrelationView.cs</DependentUpon>
    111     </Compile>
    112     <Compile Include="CheckedFilterCollectionView.cs">
    113       <SubType>UserControl</SubType>
    114     </Compile>
    115     <Compile Include="CheckedFilterCollectionView.Designer.cs">
    116       <DependentUpon>CheckedFilterCollectionView.cs</DependentUpon>
    117     </Compile>
    118     <Compile Include="CheckedTransformationListView.cs">
    119       <SubType>UserControl</SubType>
    120     </Compile>
    121     <Compile Include="CheckedTransformationListView.Designer.cs">
    122       <DependentUpon>CheckedTransformationListView.cs</DependentUpon>
    123     </Compile>
    124     <Compile Include="ComparisonFilterView.cs">
    125       <SubType>UserControl</SubType>
    126     </Compile>
    127     <Compile Include="ComparisonFilterView.Designer.cs">
    128       <DependentUpon>ComparisonFilterView.cs</DependentUpon>
    129     </Compile>
    130     <Compile Include="RenameColumnsDialog.cs">
    131       <SubType>Form</SubType>
    132     </Compile>
    133     <Compile Include="RenameColumnsDialog.Designer.cs">
    134       <DependentUpon>RenameColumnsDialog.cs</DependentUpon>
    135     </Compile>
    136     <Compile Include="ScatterPlotSingleView.cs">
    137       <SubType>UserControl</SubType>
    138     </Compile>
    139     <Compile Include="ScatterPlotSingleView.Designer.cs">
    140       <DependentUpon>ScatterPlotSingleView.cs</DependentUpon>
    141     </Compile>
    142     <Compile Include="DataCompletenessView.cs">
    143       <SubType>UserControl</SubType>
    144     </Compile>
    145     <Compile Include="DataCompletenessView.Designer.cs">
    146       <DependentUpon>DataCompletenessView.cs</DependentUpon>
    147     </Compile>
    148     <Compile Include="DataGridContentView.cs">
    149       <SubType>UserControl</SubType>
    150     </Compile>
    151     <Compile Include="DataGridContentView.Designer.cs">
    152       <DependentUpon>DataGridContentView.cs</DependentUpon>
    153     </Compile>
    154     <Compile Include="DataPreprocessingView.cs">
    155       <SubType>UserControl</SubType>
    156     </Compile>
    157     <Compile Include="DataPreprocessingView.designer.cs">
    158       <DependentUpon>DataPreprocessingView.cs</DependentUpon>
    159     </Compile>
    160     <Compile Include="DataPreprocessorStarter.cs" />
    161     <Compile Include="PreprocessingDataTableView.cs">
    162       <SubType>UserControl</SubType>
    163     </Compile>
    164     <Compile Include="PreprocessingDataTableView.Designer.cs">
    165       <DependentUpon>PreprocessingDataTableView.cs</DependentUpon>
    166     </Compile>
    167     <Compile Include="FilterView.cs">
    168       <SubType>UserControl</SubType>
    169     </Compile>
    170     <Compile Include="FilterView.Designer.cs">
    171       <DependentUpon>FilterView.cs</DependentUpon>
    172     </Compile>
    173     <Compile Include="ScatterPlotMultiView.cs">
    174       <SubType>UserControl</SubType>
    175     </Compile>
    176     <Compile Include="ScatterPlotMultiView.Designer.cs">
    177       <DependentUpon>ScatterPlotMultiView.cs</DependentUpon>
    178     </Compile>
    179     <Compile Include="PreprocessingScatterPlotView.cs">
    180       <SubType>UserControl</SubType>
    181     </Compile>
    182     <Compile Include="PreprocessingScatterPlotView.Designer.cs">
    183       <DependentUpon>PreprocessingScatterPlotView.cs</DependentUpon>
    184     </Compile>
    185     <Compile Include="SearchAndReplaceDialog.cs">
    186       <SubType>Form</SubType>
    187     </Compile>
    188     <Compile Include="SearchAndReplaceDialog.Designer.cs">
    189       <DependentUpon>SearchAndReplaceDialog.cs</DependentUpon>
    190     </Compile>
    191     <Compile Include="HistogramView.cs">
    192       <SubType>UserControl</SubType>
    193     </Compile>
    194     <Compile Include="HistogramView.Designer.cs">
    195       <DependentUpon>HistogramView.cs</DependentUpon>
    196     </Compile>
    197     <Compile Include="LineChartView.cs">
    198       <SubType>UserControl</SubType>
    199     </Compile>
    200     <Compile Include="LineChartView.Designer.cs">
    201       <DependentUpon>LineChartView.cs</DependentUpon>
    202     </Compile>
    203     <Compile Include="ManipulationView.cs">
    204       <SubType>UserControl</SubType>
    205     </Compile>
    206     <Compile Include="ManipulationView.Designer.cs">
    207       <DependentUpon>ManipulationView.cs</DependentUpon>
    208     </Compile>
    209     <Compile Include="Plugin.cs" />
    210     <Compile Include="PreprocessingCheckedVariablesView.cs">
    211       <SubType>UserControl</SubType>
    212     </Compile>
    213     <Compile Include="PreprocessingCheckedVariablesView.Designer.cs">
    214       <DependentUpon>PreprocessingCheckedVariablesView.cs</DependentUpon>
    215201    </Compile>
    216202    <Compile Include="PreprocessingCheckedItemListView.cs">
  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs

    r14401 r14421  
    6161        InitData();
    6262        GenerateChart();
     63
     64        foreach (var row in dataRows) {
     65          string variableName = row.Name;
     66          if (!IsVariableChecked(variableName)) {
     67            dataTableView.SetRowEnabled(variableName, false);
     68            dataTable.SelectedRows.Remove(variableName);
     69            dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == variableName)));
     70          }
     71        }
    6372      }
    6473    }
     
    7180
    7281      //add data rows to data tables according to checked item list
    73       foreach (var checkedItem in Content.VariableItemList.CheckedItems) {
    74         string variableName = Content.VariableItemList[checkedItem.Index].Value;
     82      foreach (var row in dataRows) {
     83        string variableName = row.Name;
     84
     85        //add row to data table
     86        dataTable.Rows.Add(row);
     87
     88        //add row to data table per variable
    7589        PreprocessingDataTable d = new PreprocessingDataTable(variableName);
    76         DataRow row = GetDataRow(variableName);
    77 
    78         if (row != null) {
    79           //add row to data table
    80           dataTable.Rows.Add(row);
    81 
    82           //add row to data table per variable
    83           d.Rows.Add(row);
    84           dataTablePerVariable.Add(d);
    85         }
     90        d.Rows.Add(row);
     91        dataTablePerVariable.Add(d);
    8692      }
    8793
     
    95101        string variableName = item.Value.Value;
    96102
    97         // not checked -> remove
     103
    98104        if (!IsVariableChecked(variableName)) {
     105          // not checked -> remove
    99106          dataTableView.SetRowEnabled(variableName, false);
    100107          dataTable.SelectedRows.Remove(variableName);
    101108          dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == variableName)));
    102109        } else {
     110          // checked -> add
    103111          DataRow row = GetDataRow(variableName);
    104112          DataRow selectedRow = GetSelectedDataRow(variableName);
  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedVariablesView.cs

    r14401 r14421  
    5656
    5757      if (Content.VariableItemList == null) {
    58         Content.VariableItemList = Content.CreateVariableItemList();
     58        IList<string> inputs = Content.PreprocessingData.InputVariables;
     59        if (Content.PreprocessingData.TargetVariable != null)
     60          inputs = inputs.Union(new[] {Content.PreprocessingData.TargetVariable}).ToList();
     61        Content.VariableItemList = Content.CreateVariableItemList(inputs);
    5962      } else {
    6063        var checkedNames = Content.VariableItemList.CheckedItems.Select(x => x.Value.Value);
    61         Content.VariableItemList = Content.CreateVariableItemList(checkedNames);
     64        Content.VariableItemList = Content.CreateVariableItemList(checkedNames.ToList());
    6265      }
    6366      Content.VariableItemList.CheckedItemsChanged += CheckedItemsChanged;
  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing/3.4

  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs

    r14185 r14421  
    2323using System.Collections.Generic;
    2424using System.Drawing;
    25 using System.Linq;
    2625using HeuristicLab.Analysis;
    2726using HeuristicLab.Common;
     
    126125
    127126
    128     public ICheckedItemList<StringValue> CreateVariableItemList(IEnumerable<string> checkedItems = null) {
     127    public ICheckedItemList<StringValue> CreateVariableItemList(IList<string> checkedItems = null) {
     128      if (checkedItems == null) checkedItems = new string[0];
    129129      ICheckedItemList<StringValue> itemList = new CheckedItemList<StringValue>();
    130130      foreach (string name in PreprocessingData.GetDoubleVariableNames()) {
    131131        var n = new StringValue(name);
    132         itemList.Add(n, (checkedItems == null) ? true : checkedItems.Contains(name));
     132        itemList.Add(n, checkedItems.Contains(name));
    133133      }
    134134      return new ReadOnlyCheckedItemList<StringValue>(itemList);
  • branches/symbreg-factors-2650/HeuristicLab.Encodings.BinaryVectorEncoding

  • branches/symbreg-factors-2650/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj

    r11961 r14421  
    126126    <Compile Include="Crossovers\NPointCrossover.cs" />
    127127    <Compile Include="BinaryVector.cs" />
     128    <Compile Include="HammingSimilarityCalculator.cs" />
    128129    <Compile Include="Interfaces\IBinaryVectorMultiNeighborhoodShakingOperator.cs" />
    129130    <Compile Include="Interfaces\IOneBitflipMoveOperator.cs" />
  • branches/symbreg-factors-2650/HeuristicLab.Problems.Binary/3.3/BinaryProblem.cs

    r14185 r14421  
    2424using System;
    2525using System.Linq;
     26using HeuristicLab.Analysis;
    2627using HeuristicLab.Common;
    2728using HeuristicLab.Core;
     
    2930using HeuristicLab.Encodings.BinaryVectorEncoding;
    3031using HeuristicLab.Optimization;
     32using HeuristicLab.Optimization.Operators;
    3133using HeuristicLab.Parameters;
    3234using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    6163      Parameters.Add(lengthParameter);
    6264      Encoding.LengthParameter = lengthParameter;
     65      Operators.Add(new HammingSimilarityCalculator());
     66      Operators.Add(new QualitySimilarityCalculator());
     67      Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
     68      Parameterize();
    6369      RegisterEventHandlers();
    6470    }
     
    8793      base.OnEncodingChanged();
    8894      Encoding.LengthParameter = LengthParameter;
     95      Parameterize();
    8996    }
    9097
     98    private void Parameterize() {
     99      foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
     100        similarityCalculator.SolutionVariableName = Encoding.SolutionCreator.BinaryVectorParameter.ActualName;
     101        similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName;
     102      }
     103    }
    91104
    92105    private void RegisterEventHandlers() {
  • branches/symbreg-factors-2650/HeuristicLab.Problems.Binary/3.3/HeuristicLab.Problems.Binary-3.3.csproj

    r11993 r14421  
    9696  </ItemGroup>
    9797  <ItemGroup>
     98    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     99      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     100      <Name>HeuristicLab.Analysis-3.3</Name>
     101      <Private>False</Private>
     102    </ProjectReference>
    98103    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    99104      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     
    124129      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
    125130      <Name>HeuristicLab.Operators-3.3</Name>
     131      <Private>False</Private>
     132    </ProjectReference>
     133    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     134      <Project>{25087811-f74c-4128-bc86-8324271da13e}</Project>
     135      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    126136      <Private>False</Private>
    127137    </ProjectReference>
     
    163173      $SolutionDir/PreBuildEvent.sh
    164174    </PreBuildEvent>
    165   </PropertyGroup> 
     175  </PropertyGroup>
    166176  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    167177       Other similar extension points exist, see Microsoft.Common.targets.
  • branches/symbreg-factors-2650/HeuristicLab.Problems.Binary/3.3/Plugin.cs.frame

    r14195 r14421  
    2828  [Plugin("HeuristicLab.Problems.Binary","Provides binary benchmark problems.", "3.3.14.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.Binary-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3031  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3132  [PluginDependency("HeuristicLab.Common", "3.3")]
     
    3435  [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
    3536  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     37  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3638  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3739  [PluginDependency("HeuristicLab.Persistence", "3.3")]
  • branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views

  • branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionScatterPlotView.cs

    r14277 r14421  
    7676      //configure axis
    7777      this.chart.CustomizeAllChartAreas();
    78       this.chart.ChartAreas[0].AxisX.Title = "Estimated Values";
     78      this.chart.ChartAreas[0].AxisY.Title = "Estimated Values";
     79      this.chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
     80      this.chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
     81      this.chart.ChartAreas[0].CursorX.Interval = 1;
     82      this.chart.ChartAreas[0].CursorY.Interval = 1;
     83
     84      this.chart.ChartAreas[0].AxisX.Title = "Target Values";
    7985      this.chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
    8086      this.chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
    81       this.chart.ChartAreas[0].CursorX.Interval = 1;
    82       this.chart.ChartAreas[0].CursorY.Interval = 1;
    83 
    84       this.chart.ChartAreas[0].AxisY.Title = "Target Values";
    85       this.chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
    86       this.chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
    87       this.chart.ChartAreas[0].AxisY.IsStartedFromZero = true;
     87      this.chart.ChartAreas[0].AxisX.IsStartedFromZero = true;
    8888    }
    8989
     
    158158        var dataset = Content.ProblemData.Dataset;
    159159        if (this.chart.Series[ALL_SERIES].Points.Count > 0)
    160           this.chart.Series[ALL_SERIES].Points.DataBindXY(Content.EstimatedValues.ToArray(), "",
    161             dataset.GetDoubleValues(targetVariableName).ToArray(), "");
     160          this.chart.Series[ALL_SERIES].Points.DataBindXY(dataset.GetDoubleValues(targetVariableName).ToArray(), "",
     161            Content.EstimatedValues.ToArray(), "");
    162162        if (this.chart.Series[TRAINING_SERIES].Points.Count > 0)
    163           this.chart.Series[TRAINING_SERIES].Points.DataBindXY(Content.EstimatedTrainingValues.ToArray(), "",
    164             dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TrainingIndices).ToArray(), "");
     163          this.chart.Series[TRAINING_SERIES].Points.DataBindXY(dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TrainingIndices).ToArray(), "",
     164            Content.EstimatedTrainingValues.ToArray(), "");
    165165        if (this.chart.Series[TEST_SERIES].Points.Count > 0)
    166           this.chart.Series[TEST_SERIES].Points.DataBindXY(Content.EstimatedTestValues.ToArray(), "",
    167            dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TestIndices).ToArray(), "");
    168 
     166          this.chart.Series[TEST_SERIES].Points.DataBindXY(dataset.GetDoubleValues(targetVariableName, Content.ProblemData.TestIndices).ToArray(), "",
     167            Content.EstimatedTestValues.ToArray(), "");
    169168        double max = Content.EstimatedTrainingValues.Concat(Content.EstimatedTestValues.Concat(Content.EstimatedValues.Concat(dataset.GetDoubleValues(targetVariableName)))).Max();
    170169        double min = Content.EstimatedTrainingValues.Concat(Content.EstimatedTestValues.Concat(Content.EstimatedValues.Concat(dataset.GetDoubleValues(targetVariableName)))).Min();
     
    172171        double axisMin, axisMax, axisInterval;
    173172        ChartUtil.CalculateOptimalAxisInterval(min, max, out axisMin, out axisMax, out axisInterval);
    174         this.chart.ChartAreas[0].AxisX.Title = "Estimated " + targetVariableName;
     173        this.chart.ChartAreas[0].AxisY.Title = "Estimated " + targetVariableName;
     174        this.chart.ChartAreas[0].AxisY.Maximum = axisMax;
     175        this.chart.ChartAreas[0].AxisY.Minimum = axisMin;
     176        this.chart.ChartAreas[0].AxisY.Interval = axisInterval;
     177        this.chart.ChartAreas[0].AxisX.Title = targetVariableName;
    175178        this.chart.ChartAreas[0].AxisX.Maximum = axisMax;
    176179        this.chart.ChartAreas[0].AxisX.Minimum = axisMin;
    177180        this.chart.ChartAreas[0].AxisX.Interval = axisInterval;
    178         this.chart.ChartAreas[0].AxisY.Title = targetVariableName;
    179         this.chart.ChartAreas[0].AxisY.Maximum = axisMax;
    180         this.chart.ChartAreas[0].AxisY.Minimum = axisMin;
    181         this.chart.ChartAreas[0].AxisY.Interval = axisInterval;
    182181
    183182        UpdateCursorInterval();
     
    216215        }
    217216        if (predictedValues.Length == targetValues.Length)
    218           series.Points.DataBindXY(predictedValues, "", targetValues, "");
     217          series.Points.DataBindXY(targetValues, "", predictedValues, "");
    219218        this.chart.Legends[series.Legend].ForeColor = Color.Black;
    220219        UpdateCursorInterval();
  • branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis

  • branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis/3.3/TableFileParser.cs

    r14330 r14421  
    2828using System.IO;
    2929using System.Linq;
    30 using System.Runtime.Serialization;
    3130using System.Text;
    3231
     
    559558                doubleVals[i] = doubleVal;
    560559              } else if (DateTime.TryParse(tok, dateTimeFormatInfo, DateTimeStyles.NoCurrentDateDefault, out dateTimeValue)
    561                 && dateTimeValue.Year > 1 && dateTimeValue.Month > 1 && dateTimeValue.Day > 1 // if no date is given it is returned as 1.1.0001 -> don't allow this
     560                && (dateTimeValue.Year > 1 || dateTimeValue.Month > 1 || dateTimeValue.Day > 1)// if no date is given it is returned as 1.1.0001 -> don't allow this
    562561                ) {
    563562                type = TokenTypeEnum.DateTime;
  • branches/symbreg-factors-2650/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

    r14185 r14421  
    251251      Operators.Add(new KnapsackPathRelinker());
    252252      Operators.Add(new KnapsackSimultaneousPathRelinker());
    253       Operators.Add(new KnapsackSimilarityCalculator());
     253      Operators.Add(new HammingSimilarityCalculator());
    254254      Operators.Add(new QualitySimilarityCalculator());
    255       Operators.Add(new NoSimilarityCalculator());
    256255
    257256      Operators.Add(new BestKnapsackSolutionAnalyzer());
  • branches/symbreg-factors-2650/HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs

    r14185 r14421  
    2525using HeuristicLab.Encodings.BinaryVectorEncoding;
    2626using HeuristicLab.Optimization.Operators;
     27using HeuristicLab.PluginInfrastructure;
    2728
    2829namespace HeuristicLab.Problems.Knapsack {
     
    3435  /// </remarks>
    3536  [Item("KnapsackSimilarityCalculator", "An operator that performs similarity calculation between two knapsack solutions. The operator calculates the similarity based on the number of elements the two solutions have in common.")]
    36   public sealed class KnapsackSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
     37  [NonDiscoverableType]
     38  [Obsolete("Please use the HammingSimilarityCalculator in the HeuristicLab.Encodings.BinaryVector plugin.")]
     39  internal sealed class KnapsackSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
    3740    protected override bool IsCommutative { get { return true; } }
    3841
  • branches/symbreg-factors-2650/HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj

    r11939 r14421  
    118118  <ItemGroup>
    119119    <None Include="Plugin.cs.frame" />
     120    <Compile Include="GammaDistributedRandom.cs" />
    120121    <Compile Include="ListExtensions.cs" />
    121122    <Compile Include="UniformDistributedRandom.cs" />
Note: See TracChangeset for help on using the changeset viewer.