Changeset 15352


Ignore:
Timestamp:
09/07/17 08:22:47 (5 years ago)
Author:
gkronber
Message:

#2789 testing alglib RBF and splines

Location:
branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental/HeuristicLab.Algorithms.DataAnalysis.Experimental.csproj

    r15349 r15352  
    131131  <ItemGroup>
    132132    <Compile Include="ForwardSelection.cs" />
     133    <Compile Include="RBF.cs" />
     134    <Compile Include="Splines.cs" />
    133135    <Compile Include="LinearRegressionCombinations.cs" />
    134136    <Compile Include="NonlinearRegression.cs" />
  • branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental/SymbolicRegressionConstantOptimizationEvaluator.cs

    r15322 r15352  
    223223      var target = problemData.TargetVariable;
    224224
    225       // only count constraints
    226       var constraintRows = Enumerable.Range(0, problemData.Dataset.Rows).Where(rIdx => !string.IsNullOrEmpty(ds.GetStringValue("f(x) constraint-type", rIdx)));
     225      // determine rows with constraints by checking of any constraint column contains a value
     226      var constraintColNames = parameterEntries
     227                .Select(e => e.variableName)
     228                .Select(name => string.Format("df/d({0})", name))
     229                .ToArray();
     230      var constraintRows = Enumerable.Range(0, problemData.Dataset.Rows)
     231                .Where(rIdx => constraintColNames.Any(name => !double.IsNaN(ds.GetDoubleValue(name, rIdx))));
    227232
    228233      double[,] constraintX = new double[constraintRows.Count(), parameters.Count]; // inputs for constraint values
     
    271276      int updateFreq = 10;
    272277      try {
    273         // alglib.lsfitcreatefg(x, y, c, n, m, k, false, out state);
    274         // alglib.lsfitsetcond(state, 0.0, maxIterations);
    275         // //alglib.lsfitsetgradientcheck(state, 0.001);
    276         // alglib.lsfitfit(state, function_cx_1_func, function_cx_1_grad, null, null);
    277         // alglib.lsfitresults(state, out retVal, out c, out rep);
    278278        alglib.minnlccreate(c, out state);
    279279        alglib.minnlcsetalgoaul(state, rho, outeriters);
Note: See TracChangeset for help on using the changeset viewer.