Ignore:
Timestamp:
11/06/13 10:45:46 (8 years ago)
Author:
mkommend
Message:

#1997: Branched Problems.DataAnalysis.Symbolic for island data analysis algorithms.

Location:
branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators/SymbolicDataAnalysisEvaluator.cs

    r9456 r10110  
    4747    private const string ApplyLinearScalingParameterName = "ApplyLinearScaling";
    4848    private const string ValidRowIndicatorParameterName = "ValidRowIndicator";
     49    private const string RowsParameterName = "Rows";
    4950
    5051    public override bool CanChangeName { get { return false; } }
     
    8283    public IValueLookupParameter<StringValue> ValidRowIndicatorParameter {
    8384      get { return (IValueLookupParameter<StringValue>)Parameters[ValidRowIndicatorParameterName]; }
     85    }
     86    public ILookupParameter<EnumerableItem<int>> RowsParameter {
     87      get { return (ILookupParameter<EnumerableItem<int>>)Parameters[RowsParameterName]; }
    8488    }
    8589    #endregion
     
    102106      Parameters.Add(new LookupParameter<BoolValue>(ApplyLinearScalingParameterName, "Flag that indicates if the individual should be linearly scaled before evaluating."));
    103107      Parameters.Add(new ValueLookupParameter<StringValue>(ValidRowIndicatorParameterName, "An indicator variable in the data set that specifies which rows should be evaluated (those for which the indicator <> 0) (optional)."));
     108      Parameters.Add(new LookupParameter<EnumerableItem<int>>(RowsParameterName, "TODO"));
    104109    }
    105110
     
    112117      if (!Parameters.ContainsKey(ValidRowIndicatorParameterName))
    113118        Parameters.Add(new ValueLookupParameter<StringValue>(ValidRowIndicatorParameterName, "An indicator variable in the data set that specifies which rows should be evaluated (those for which the indicator <> 0) (optional)."));
     119      if (!Parameters.ContainsKey(RowsParameterName))
     120        Parameters.Add(new LookupParameter<EnumerableItem<int>>(RowsParameterName, "TODO"));
    114121    }
    115122
    116123    protected IEnumerable<int> GenerateRowsToEvaluate() {
    117       return GenerateRowsToEvaluate(RelativeNumberOfEvaluatedSamplesParameter.ActualValue.Value);
     124      IEnumerable<int> rows = null;
     125      if (RowsParameter.ActualValue != null)
     126        rows = RowsParameter.ActualValue.Enumerable;
     127      if (rows == null) rows = GenerateRowsToEvaluate(RelativeNumberOfEvaluatedSamplesParameter.ActualValue.Value);
     128      return rows;
    118129    }
    119130
  • branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r9828 r10110  
    4646    <WarningLevel>4</WarningLevel>
    4747    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     48    <Prefer32Bit>false</Prefer32Bit>
    4849  </PropertyGroup>
    4950  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    5556    <WarningLevel>4</WarningLevel>
    5657    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     58    <Prefer32Bit>false</Prefer32Bit>
    5759  </PropertyGroup>
    5860  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    6466    <ErrorReport>prompt</ErrorReport>
    6567    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     68    <Prefer32Bit>false</Prefer32Bit>
    6669  </PropertyGroup>
    6770  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    7376    <ErrorReport>prompt</ErrorReport>
    7477    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     78    <Prefer32Bit>false</Prefer32Bit>
    7579  </PropertyGroup>
    7680  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    8286    <ErrorReport>prompt</ErrorReport>
    8387    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     88    <Prefer32Bit>false</Prefer32Bit>
    8489  </PropertyGroup>
    8590  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    9196    <ErrorReport>prompt</ErrorReport>
    9297    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     98    <Prefer32Bit>false</Prefer32Bit>
    9399  </PropertyGroup>
    94100  <ItemGroup>
     
    143149    <Compile Include="Interfaces\ISymbolicDataAnalysisExpressionCrossover.cs" />
    144150    <Compile Include="Interfaces\ISymbolicDataAnalysisImpactValuesCalculator.cs" />
     151    <Compile Include="Interpreter\ExpressionTreeInterpreter.cs" />
    145152    <Compile Include="Interpreter\InterpreterState.cs" />
    146153    <Compile Include="Interpreter\OpCodes.cs" />
Note: See TracChangeset for help on using the changeset viewer.