Changeset 12109 for branches/HeuristicLab.DatasetRefactor
- Timestamp:
- 03/03/15 14:00:38 (9 years ago)
- Location:
- branches/HeuristicLab.DatasetRefactor/sources
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.DatasetRefactor/sources
- Property svn:mergeinfo changed
/trunk/sources merged: 12106-12108
- Property svn:mergeinfo changed
-
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs
r12105 r12109 206 206 } 207 207 if (Parameters.ContainsKey("SimilarityCalculator")) { 208 #pragma warning disable 0618 208 209 var oldParameter = (IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; 210 #pragma warning restore 0618 209 211 Parameters.Remove(oldParameter); 210 212 var newParameter = new ConstrainedValueParameter<ISolutionSimilarityCalculator>("SimilarityCalculator", "The operator used to calculate the similarity between two solutions.", new ItemSet<ISolutionSimilarityCalculator>(oldParameter.ValidValues)); … … 508 510 SimilarityCalculatorParameter.ValidValues.Add(similarityCalculator); 509 511 512 if (!SimilarityCalculatorParameter.ValidValues.Any()) { 513 SimilarityCalculatorParameter.ValidValues.Add(new QualitySimilarityCalculator { QualityVariableName = Problem.Evaluator.QualityParameter.ActualName }); 514 SimilarityCalculatorParameter.ValidValues.Add(new NoSimilarityCalculator()); 515 } 516 510 517 if (oldSimilarityCalculator != null) { 511 518 ISolutionSimilarityCalculator similarityCalculator = SimilarityCalculatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSimilarityCalculator.GetType()); -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs
r12105 r12109 163 163 #region Backwards compatible code, remove with 3.4 164 164 if (Parameters.ContainsKey("SimilarityCalculator")) { 165 #pragma warning disable 0618 165 166 var oldParameter = (IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; 167 #pragma warning restore 0618 166 168 Parameters.Remove(oldParameter); 167 169 var newParameter = new ConstrainedValueParameter<ISolutionSimilarityCalculator>("SimilarityCalculator", "The operator used to calculate the similarity between two solutions.", new ItemSet<ISolutionSimilarityCalculator>(oldParameter.ValidValues)); … … 408 410 SimilarityCalculatorParameter.ValidValues.Add(similarityCalculator); 409 411 412 if (!SimilarityCalculatorParameter.ValidValues.Any()) { 413 SimilarityCalculatorParameter.ValidValues.Add(new QualitySimilarityCalculator { QualityVariableName = Problem.Evaluator.QualityParameter.ActualName }); 414 SimilarityCalculatorParameter.ValidValues.Add(new NoSimilarityCalculator()); 415 } 416 410 417 if (oldSimilarityCalculator != null) { 411 418 ISolutionSimilarityCalculator similarityCalculator = SimilarityCalculatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSimilarityCalculator.GetType()); -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/Program.cs
r12031 r12109 29 29 private static void Main(string[] args) { 30 30 // Install as service, see http://stackoverflow.com/a/12703878 31 if (Environment.UserInteractive) { 32 try { 33 string parameter = string.Concat(args); 34 switch (parameter) { 35 case "--install": 36 ManagedInstallerClass.InstallHelper(new[] { Assembly.GetExecutingAssembly().Location }); 37 break; 38 case "--uninstall": 39 ManagedInstallerClass.InstallHelper(new[] { "/u", Assembly.GetExecutingAssembly().Location }); 40 break; 41 } 31 bool installDone = false; 32 try { 33 string parameter = string.Concat(args); 34 switch (parameter) { 35 case "--install": 36 installDone = true; 37 ManagedInstallerClass.InstallHelper(new[] { Assembly.GetExecutingAssembly().Location }); 38 break; 39 case "--uninstall": 40 installDone = true; 41 ManagedInstallerClass.InstallHelper(new[] { "/u", Assembly.GetExecutingAssembly().Location }); 42 break; 42 43 } 43 catch (Exception ex) { 44 Console.WriteLine("Error on (un)install of Hive Slave service: " + Environment.NewLine + ex); 45 } 46 } else { 44 } 45 catch (Exception ex) { 46 Console.WriteLine("Error on (un)install of Hive Slave service: " + Environment.NewLine + ex); 47 } 48 49 if (!installDone) { 47 50 ServiceBase[] ServicesToRun; 48 51 ServicesToRun = new ServiceBase[] -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimization.Operators/3.3/SingleObjectiveSolutionSimilarityCalculator.cs
r12105 r12109 31 31 [Item("SimilarityCalculator", "A base class for items that perform similarity calculation between two solutions.")] 32 32 [StorableClass] 33 #pragma warning disable 0618 33 34 public abstract class SingleObjectiveSolutionSimilarityCalculator : SolutionSimilarityCalculator, ISingleObjectiveSolutionSimilarityCalculator { 35 #pragma warning restore 0618 34 36 [StorableConstructor] 35 37 protected SingleObjectiveSolutionSimilarityCalculator(bool deserializing) : base(deserializing) { } -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 12108
- Property svn:mergeinfo changed
-
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification merged: 12108
- Property svn:mergeinfo changed
-
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator.cs
r12031 r12109 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 29 30 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {30 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.SingleObjective { 31 31 [Item("Mean squared error Evaluator", "Calculates the mean squared error of a symbolic classification solution.")] 32 32 [StorableClass] -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs
r12105 r12109 25 25 using HeuristicLab.Parameters; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.SingleObjective; 27 28 28 29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification { -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Creators/MultiSymbolicDataAnalysisExpressionCreator.cs
r12105 r12109 34 34 using HeuristicLab.PluginInfrastructure; 35 35 36 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {36 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Creators { 37 37 public class MultiSymbolicDataAnalysisExpressionCreator : StochasticMultiBranch<ISymbolicDataAnalysisSolutionCreator>, 38 38 ISymbolicDataAnalysisSolutionCreator,
Note: See TracChangeset
for help on using the changeset viewer.