Changeset 14558


Ignore:
Timestamp:
01/11/17 07:38:33 (3 years ago)
Author:
bwerth
Message:

#2700 made TSNE compatible with the new pausible BasicAlgs, removed rescaling of scatterplots during alg to give it a more movie-esque feel

Location:
branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/GBM/GradientBoostingRegressionAlgorithm.cs

    r14518 r14558  
    5252      get { return (IRegressionProblem)base.Problem; }
    5353      set { base.Problem = value; }
     54    }
     55    public override bool SupportsPause
     56    {
     57      get { return false; }
    5458    }
    5559
  • branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesAlgorithm.cs

    r14518 r14558  
    4848      set { base.Problem = value; }
    4949    }
     50    public override bool SupportsPause
     51    {
     52      get { return false; }
     53    }
    5054
    5155    #region ParameterNames
  • branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/MctsSymbolicRegressionAlgorithm.cs

    r14185 r14558  
    2222using System;
    2323using System.Linq;
    24 using System.Runtime.CompilerServices;
    2524using System.Threading;
    2625using HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression.Policies;
     
    3938  [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 250)]
    4039  public class MctsSymbolicRegressionAlgorithm : BasicAlgorithm {
    41     public override Type ProblemType {
     40    public override Type ProblemType
     41    {
    4242      get { return typeof(IRegressionProblem); }
    4343    }
    44     public new IRegressionProblem Problem {
     44    public new IRegressionProblem Problem
     45    {
    4546      get { return (IRegressionProblem)base.Problem; }
    4647      set { base.Problem = value; }
     48    }
     49    public override bool SupportsPause
     50    {
     51      get { return false; }
    4752    }
    4853
     
    6873
    6974    #region ParameterProperties
    70     public IFixedValueParameter<IntValue> IterationsParameter {
     75    public IFixedValueParameter<IntValue> IterationsParameter
     76    {
    7177      get { return (IFixedValueParameter<IntValue>)Parameters[IterationsParameterName]; }
    7278    }
    73     public IFixedValueParameter<IntValue> MaxVariableReferencesParameter {
     79    public IFixedValueParameter<IntValue> MaxVariableReferencesParameter
     80    {
    7481      get { return (IFixedValueParameter<IntValue>)Parameters[MaxVariablesParameterName]; }
    7582    }
    76     public IFixedValueParameter<BoolValue> ScaleVariablesParameter {
     83    public IFixedValueParameter<BoolValue> ScaleVariablesParameter
     84    {
    7785      get { return (IFixedValueParameter<BoolValue>)Parameters[ScaleVariablesParameterName]; }
    7886    }
    79     public IFixedValueParameter<IntValue> ConstantOptimizationIterationsParameter {
     87    public IFixedValueParameter<IntValue> ConstantOptimizationIterationsParameter
     88    {
    8089      get { return (IFixedValueParameter<IntValue>)Parameters[ConstantOptimizationIterationsParameterName]; }
    8190    }
    82     public IValueParameter<IPolicy> PolicyParameter {
     91    public IValueParameter<IPolicy> PolicyParameter
     92    {
    8393      get { return (IValueParameter<IPolicy>)Parameters[PolicyParameterName]; }
    8494    }
    85     public IFixedValueParameter<DoubleValue> PunishmentFactorParameter {
     95    public IFixedValueParameter<DoubleValue> PunishmentFactorParameter
     96    {
    8697      get { return (IFixedValueParameter<DoubleValue>)Parameters[PunishmentFactorParameterName]; }
    8798    }
    88     public IValueParameter<ICheckedItemList<StringValue>> AllowedFactorsParameter {
     99    public IValueParameter<ICheckedItemList<StringValue>> AllowedFactorsParameter
     100    {
    89101      get { return (IValueParameter<ICheckedItemList<StringValue>>)Parameters[AllowedFactorsParameterName]; }
    90102    }
    91     public IFixedValueParameter<IntValue> SeedParameter {
     103    public IFixedValueParameter<IntValue> SeedParameter
     104    {
    92105      get { return (IFixedValueParameter<IntValue>)Parameters[SeedParameterName]; }
    93106    }
    94     public FixedValueParameter<BoolValue> SetSeedRandomlyParameter {
     107    public FixedValueParameter<BoolValue> SetSeedRandomlyParameter
     108    {
    95109      get { return (FixedValueParameter<BoolValue>)Parameters[SetSeedRandomlyParameterName]; }
    96110    }
    97     public IFixedValueParameter<IntValue> UpdateIntervalParameter {
     111    public IFixedValueParameter<IntValue> UpdateIntervalParameter
     112    {
    98113      get { return (IFixedValueParameter<IntValue>)Parameters[UpdateIntervalParameterName]; }
    99114    }
    100     public IFixedValueParameter<BoolValue> CreateSolutionParameter {
     115    public IFixedValueParameter<BoolValue> CreateSolutionParameter
     116    {
    101117      get { return (IFixedValueParameter<BoolValue>)Parameters[CreateSolutionParameterName]; }
    102118    }
     
    104120
    105121    #region Properties
    106     public int Iterations {
     122    public int Iterations
     123    {
    107124      get { return IterationsParameter.Value.Value; }
    108125      set { IterationsParameter.Value.Value = value; }
    109126    }
    110     public int Seed {
     127    public int Seed
     128    {
    111129      get { return SeedParameter.Value.Value; }
    112130      set { SeedParameter.Value.Value = value; }
    113131    }
    114     public bool SetSeedRandomly {
     132    public bool SetSeedRandomly
     133    {
    115134      get { return SetSeedRandomlyParameter.Value.Value; }
    116135      set { SetSeedRandomlyParameter.Value.Value = value; }
    117136    }
    118     public int MaxVariableReferences {
     137    public int MaxVariableReferences
     138    {
    119139      get { return MaxVariableReferencesParameter.Value.Value; }
    120140      set { MaxVariableReferencesParameter.Value.Value = value; }
    121141    }
    122     public IPolicy Policy {
     142    public IPolicy Policy
     143    {
    123144      get { return PolicyParameter.Value; }
    124145      set { PolicyParameter.Value = value; }
    125146    }
    126     public double PunishmentFactor {
     147    public double PunishmentFactor
     148    {
    127149      get { return PunishmentFactorParameter.Value.Value; }
    128150      set { PunishmentFactorParameter.Value.Value = value; }
    129151    }
    130     public ICheckedItemList<StringValue> AllowedFactors {
     152    public ICheckedItemList<StringValue> AllowedFactors
     153    {
    131154      get { return AllowedFactorsParameter.Value; }
    132155    }
    133     public int ConstantOptimizationIterations {
     156    public int ConstantOptimizationIterations
     157    {
    134158      get { return ConstantOptimizationIterationsParameter.Value.Value; }
    135159      set { ConstantOptimizationIterationsParameter.Value.Value = value; }
    136160    }
    137     public bool ScaleVariables {
     161    public bool ScaleVariables
     162    {
    138163      get { return ScaleVariablesParameter.Value.Value; }
    139164      set { ScaleVariablesParameter.Value.Value = value; }
    140165    }
    141     public bool CreateSolution {
     166    public bool CreateSolution
     167    {
    142168      get { return CreateSolutionParameter.Value.Value; }
    143169      set { CreateSolutionParameter.Value.Value = value; }
  • branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/TSNE.cs

    r14518 r14558  
    247247        if (!plot.Rows.ContainsKey(rowName)) {
    248248          plot.Rows.Add(dataRows.ContainsKey(rowName) ? dataRows[rowName] : new ScatterPlotDataRow(rowName, "", new List<Point2D<double>>()));
    249         } else plot.Rows[rowName].Points.Clear();
    250         plot.Rows[rowName].Points.AddRange(dataRowLookup[rowName].Select(i => new Point2D<double>(lowDimData[i, 0], lowDimData[i, 1])));
     249        }
     250        //else plot.Rows[rowName].Points.Clear();
     251        plot.Rows[rowName].Points.Replace(dataRowLookup[rowName].Select(i => new Point2D<double>(lowDimData[i, 0], lowDimData[i, 1])));
     252        //plot.Rows[rowName].Points.AddRange();
    251253      }
    252254    }
  • branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/TSNEAnalysis.cs

    r14518 r14558  
    4444  [StorableClass]
    4545  public sealed class TSNEAnalysis : BasicAlgorithm {
    46 
     46    public override bool SupportsPause
     47    {
     48      get { return false; }
     49    }
    4750    public override Type ProblemType
    4851    {
Note: See TracChangeset for help on using the changeset viewer.