Changeset 15255

Timestamp:

07/15/17 14:19:44 (7 years ago)

Author:

abeham

Message:

#2457: small changes

Location:

branches/PerformanceComparison

Files:

• HeuristicLab.Algorithms.MemPR/3.3/Permutation/SolutionModel/Univariate/UnivariateAbsoluteModel.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.MemPR/3.3/Permutation/SolutionModel/Univariate/UnivariateRelativeModel.cs (modified) (2 diffs)
• HeuristicLab.OptimizationExpertSystem.Common/3.3 (modified) (1 prop)
• HeuristicLab.OptimizationExpertSystem.Common/3.3/KnowledgeCenter.cs (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/KNearestNeighborRecommender.cs (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Permutation/SolutionModel/Univariate/UnivariateAbsoluteModel.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Algorithms.MemPR.Interfaces;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -30 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Algorithms.MemPR.Permutation.SolutionModel.Univariate {

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Permutation/SolutionModel/Univariate/UnivariateRelativeModel.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Algorithms.MemPR.Interfaces;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -30 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Algorithms.MemPR.Permutation.SolutionModel.Univariate {

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3

@@ -2 +2 @@
 bin
 obj
+*.user

@@ -2 +2 @@
 bin
 obj
+*.user

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/KnowledgeCenter.cs

@@ -244 +244 @@
         tsneFeatures[key2Idx.GetByFirst(instance.Key)] = new DoubleArray(instance.Value);
       }
-      var tsne = new TSNE<DoubleArray>(new EuclidianDistance(), new FastRandom(42), stopLyingIter: 0, momSwitchIter: 0, momentum: 0, finalMomentum: 0, eta: 10);
-      var tsneCoords = tsne.Run(tsneFeatures, 2, Math.Min((instances.Count - 1) / 4, 50), 0);
-      //var tsneCoords = TSNE<DoubleArray>.Run(tsneFeatures, 2, Math.Min((instances.Count - 1) / 4, 50), 0, euclidDArray, new FastRandom(42));
+      var tsneCoords = TSNEStatic<DoubleArray>.Run(tsneFeatures, new EuclideanDistance(), new FastRandom(42),
+        newDimensions: 2, perplexity: Math.Min((instances.Count - 1) / 4, 50), theta: 0,
+        stopLyingIter: 0, momSwitchIter: 0, momentum: 0, finalMomentum: 0, eta: 10);
       #endregion
 

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/KNearestNeighborRecommender.cs

@@ -37 +37 @@
     }
 
+    public int K {
+      get { return KParameter.Value.Value; }
+      set { KParameter.Value.Value = value; }
+    }
+
     [StorableConstructor]
     private KNearestNeighborRecommender(bool deserializing) : base(deserializing) { }

@@ -2 +2 @@
 bin
 obj
+*.user