Changeset 12797


Ignore:
Timestamp:
07/22/15 10:25:02 (4 years ago)
Author:
gkronber
Message:

#2439: fixed problem in GaussianProcess algorithm after changes in BFGS

Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessBase.cs

    r12012 r12797  
    108108      Parameters[ApproximateGradientsParameterName].Hidden = true; // should not be changed
    109109
     110      // necessary for BFGS
     111      Parameters.Add(new ValueParameter<BoolValue>("Maximization", new BoolValue(false)));
     112      Parameters["Maximization"].Hidden = true;
     113
    110114      var randomCreator = new HeuristicLab.Random.RandomCreator();
    111115      var gpInitializer = new GaussianProcessHyperparameterInitializer();
     
    181185    [StorableHook(HookType.AfterDeserialization)]
    182186    private void AfterDeserialization() {
     187      // BackwardsCompatibility3.4
     188      #region Backwards compatible code, remove with 3.5
     189      if (!Parameters.ContainsKey("Maximization")) {
     190        Parameters.Add(new ValueParameter<BoolValue>("Maximization", new BoolValue(false)));
     191        Parameters["Maximization"].Hidden = true;
     192      }
     193      #endregion
    183194    }
    184195  }
  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsUpdateResults.cs

    r12794 r12797  
    6262    private DoubleValue Quality { get { return QualityParameter.ActualValue; } }
    6363    private LbfgsState State { get { return StateParameter.ActualValue; } }
    64     private BoolValue Maximization { get { return MaximizationParameter.ActualValue; } }
     64
     65    private BoolValue Maximization {
     66      get {
     67        // BackwardsCompatibility3.3
     68        #region Backwards compatible code, remove with 3.4
     69        // the parameter is new, previously we assumed minimization problems
     70        if (MaximizationParameter.ActualValue == null) return new BoolValue(false);
     71        #endregion
     72        return MaximizationParameter.ActualValue;
     73      }
     74    }
     75
    6576    #endregion
    6677
Note: See TracChangeset for help on using the changeset viewer.