Changeset 16896


Ignore:
Timestamp:
05/06/19 13:14:50 (3 months ago)
Author:
chaider
Message:

#2971 Renaming and moving files:

Renamed:

NamedIntervals => IntervalCollection
ParsedConstraint => ProblemDataConstraint
NamedIntervalsView => IntervalCollectionView

Folder Parser => Interval

Moved:

IntervalCollectionView from Regression/IntervalCollectionView ==> ./IntervalCollectionView
Interval, IntervalCollection from /Implementation => /Implementation/Interval

Location:
branches/2971_named_intervals
Files:
5 edited
2 copied
6 moved

Legend:

Unmodified
Added
Removed
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r16885 r16896  
    338338      <DependentUpon>ProblemDataView.cs</DependentUpon>
    339339    </Compile>
    340     <Compile Include="Regression\NamedIntervalsView.cs">
    341       <SubType>UserControl</SubType>
    342     </Compile>
    343     <Compile Include="Regression\NamedIntervalsView.Designer.cs">
    344       <DependentUpon>NamedIntervalsView.cs</DependentUpon>
     340    <Compile Include="IntervalCollectionView.cs">
     341      <SubType>UserControl</SubType>
     342    </Compile>
     343    <Compile Include="IntervalCollectionView.Designer.cs">
     344      <DependentUpon>IntervalCollectionView.cs</DependentUpon>
    345345    </Compile>
    346346    <Compile Include="Regression\ConfidenceRegressionSolutionEstimatedValuesView.cs">
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs

    r16870 r16896  
    2828namespace HeuristicLab.Problems.DataAnalysis.Views {
    2929  [View("ParsedConstraint View")]
    30   [Content(typeof(ParsedConstraint), true)]
     30  [Content(typeof(ProblemDataConstraint), true)]
    3131  public partial class ParsedConstraintView : AsynchronousContentView {
    3232    private CheckedItemList<IntervalConstraint> intervalConstraints;
    33     public new ParsedConstraint Content {
    34       get => (ParsedConstraint)base.Content;
     33    public new ProblemDataConstraint Content {
     34      get => (ProblemDataConstraint)base.Content;
    3535      set => base.Content = value;
    3636    }
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r16843 r16896  
    193193    <Compile Include="Implementation\ConstantModel.cs" />
    194194    <Compile Include="Implementation\DataAnalysisModel.cs" />
    195     <Compile Include="Implementation\Interval.cs" />
    196     <Compile Include="Implementation\NamedIntervals.cs" />
    197     <Compile Include="Implementation\Parser\IntervalConstraint.cs" />
    198     <Compile Include="Implementation\Parser\IntervalConstraintsParser.cs" />
     195    <Compile Include="Implementation\Interval\Interval.cs" />
     196    <Compile Include="Implementation\Interval\IntervalCollection.cs" />
     197    <Compile Include="Implementation\Interval\IntervalConstraint.cs" />
     198    <Compile Include="Implementation\Interval\IntervalConstraintsParser.cs" />
    199199    <Compile Include="Implementation\Regression\ConfidenceBoundRegressionSolution.cs" />
    200200    <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
     
    301301    <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
    302302    <Compile Include="OnlineCalculators\OnlineWeightedClassificationMeanSquaredErrorCalculator.cs" />
    303     <Compile Include="ParsedConstraint.cs" />
     303    <Compile Include="ProblemDataConstraint.cs" />
    304304    <Compile Include="Plugin.cs" />
    305305    <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r16884 r16896  
    9494      problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
    9595      problemData.Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, "", new NamedIntervals()));
    96       problemData.Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, "", new ParsedConstraint()));
     96      problemData.Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, "", new ProblemDataConstraint()));
    9797      emptyProblemData = problemData;
    9898    }
     
    111111
    112112
    113     public IFixedValueParameter<ParsedConstraint> IntervalConstraintsParameter => (IFixedValueParameter<ParsedConstraint>)Parameters[IntervalConstraintsParameterName];
    114 
    115     public ParsedConstraint IntervalConstraints {
     113    public IFixedValueParameter<ProblemDataConstraint> IntervalConstraintsParameter => (IFixedValueParameter<ProblemDataConstraint>)Parameters[IntervalConstraintsParameterName];
     114
     115    public ProblemDataConstraint IntervalConstraints {
    116116      get => IntervalConstraintsParameter.Value;
    117117      set => IntervalConstraints = value ?? throw new ArgumentNullException("IntervalCosntraint", "The given Constraint is null.");
     
    158158      }
    159159      if (!Parameters.ContainsKey(IntervalConstraintsParameterName)) {
    160         Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(this)));
     160        Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
    161161      }
    162162      RegisterParameterEvents();
     
    196196     
    197197      Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
    198       Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(this)));
     198      Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
    199199      RegisterParameterEvents();
    200200    }
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

    r16845 r16896  
    2929
    3030    NamedIntervals VariableRanges { get; set; }
    31     ParsedConstraint IntervalConstraints { get; set; }
     31    ProblemDataConstraint IntervalConstraints { get; set; }
    3232
    3333    IEnumerable<double> TargetVariableValues { get; }
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs

    r16895 r16896  
    3030  [StorableType("A56BFB05-8F11-4766-9FBF-20C7010F1CA3")]
    3131  [Item("ParsedConstraint", "Represents parsed constraints.")]
    32   public class ParsedConstraint : Item {
     32  public class ProblemDataConstraint : Item {
    3333    private static readonly string exampleInput = "# Example for a target variable constraint:" + Environment.NewLine +
    3434                                                  "Target:'y' in [0 .. 100]" + Environment.NewLine + Environment.NewLine +
     
    5353
    5454    [StorableConstructor]
    55     protected ParsedConstraint(StorableConstructorFlag _) : base(_) { }
     55    protected ProblemDataConstraint(StorableConstructorFlag _) : base(_) { }
    5656
    57     protected ParsedConstraint(ParsedConstraint original, Cloner cloner)
     57    protected ProblemDataConstraint(ProblemDataConstraint original, Cloner cloner)
    5858      : base(original, cloner) {
    5959      this.Input = original.Input;
     
    6363
    6464    public override IDeepCloneable Clone(Cloner cloner) {
    65       return new ParsedConstraint(this, cloner);
     65      return new ProblemDataConstraint(this, cloner);
    6666    }
    6767
    68     public ParsedConstraint() :base () {
     68    public ProblemDataConstraint() :base () {
    6969      this.Input = exampleInput;
    7070      this.constraints = new CheckedItemList<IntervalConstraint>();
     
    7272    }
    7373
    74     public ParsedConstraint(IRegressionProblemData problemData) : base() {
     74    public ProblemDataConstraint(IRegressionProblemData problemData) : base() {
    7575      this.Input = exampleInput;
    7676      this.constraints = new List<IntervalConstraint>();
Note: See TracChangeset for help on using the changeset viewer.