Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/28/11 17:27:55 (14 years ago)
Author:
mkommend
Message:

#1418: Adapted data analysis classes to new parameter ctors.

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

    r5809 r5847  
    4343    }
    4444
     45    public Dataset()
     46      : base() {
     47      Name = "-";
     48      VariableNames = Enumerable.Empty<string>();
     49      data = new double[0, 0];
     50    }
     51
    4552    public Dataset(IEnumerable<string> variableNames, double[,] data)
    4653      : base() {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r5809 r5847  
    254254      var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
    255255      Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.Where(x => x.Value == targetVariable).First()));
    256       Parameters.Add(new FixedValueParameter<StringMatrix>(ClassNamesParameterName, "", new StringMatrix()));
    257       Parameters.Add(new FixedValueParameter<DoubleMatrix>(ClassificationPenaltiesParameterName, "", new DoubleMatrix()));
     256      Parameters.Add(new FixedValueParameter<StringMatrix>(ClassNamesParameterName, ""));
     257      Parameters.Add(new FixedValueParameter<DoubleMatrix>(ClassificationPenaltiesParameterName, ""));
    258258
    259259      ResetTargetVariableDependentMembers();
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

    r5809 r5847  
    4242      get { return (IFixedValueParameter<Dataset>)Parameters[DatasetParameterName]; }
    4343    }
    44     public IFixedValueParameter<ICheckedItemList<StringValue>> InputVariablesParameter {
    45       get { return (IFixedValueParameter<ICheckedItemList<StringValue>>)Parameters[InputVariablesParameterName]; }
     44    public IFixedValueParameter<ReadOnlyCheckedItemList<StringValue>> InputVariablesParameter {
     45      get { return (IFixedValueParameter<ReadOnlyCheckedItemList<StringValue>>)Parameters[InputVariablesParameterName]; }
    4646    }
    4747    public IFixedValueParameter<IntRange> TrainingPartitionParameter {
     
    106106
    107107      Parameters.Add(new FixedValueParameter<Dataset>(DatasetParameterName, "", dataset));
    108       Parameters.Add(new FixedValueParameter<ICheckedItemList<StringValue>>(InputVariablesParameterName, "", inputVariables.AsReadOnly()));
     108      Parameters.Add(new FixedValueParameter<ReadOnlyCheckedItemList<StringValue>>(InputVariablesParameterName, "", inputVariables.AsReadOnly()));
    109109      Parameters.Add(new FixedValueParameter<IntRange>(TrainingPartitionParameterName, "", new IntRange(trainingPartitionStart, trainingPartitionEnd)));
    110110      Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", new IntRange(testPartitionStart, testPartitionEnd)));
Note: See TracChangeset for help on using the changeset viewer.