Add files via upload

mcychan · Jul 24, 2023 · d63b04b · d63b04b
1 parent 8f3a874
commit d63b04b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/nQuant.Master/PnnLABGAQuantizer.cs b/nQuant.Master/PnnLABGAQuantizer.cs
@@ -82,8 +82,8 @@ private string RatioKey
 		private AmplifyFn GetAmplifyFn(bool tooSmall)
 		{
 			if (tooSmall)
-				return val => Math.Exp(val);
-			return val => Math.Log(val);
+                return val => Math.PI * val;
+            return val => .5 * Math.PI * val;
 		}
 
 		private void CalculateError(double[] errors)

diff --git a/nQuant.Master/ga/NsgaIII.cs b/nQuant.Master/ga/NsgaIII.cs
@@ -551,12 +551,13 @@ protected List<T> Selection(List<T> cur, List<ReferencePoint> rps)
 
 		protected virtual List<T> Crossing(List<T> population)
 		{
-			var offspring = new List<T>(_populationSize);
-			Parallel.ForEach(Enumerable.Range(0, _populationSize), i => {
+            var populationSize = population.Count;
+            var offspring = new List<T>(populationSize);
+			Parallel.ForEach(Enumerable.Range(0, populationSize), i => {
 				if (i % 2 == 0) {
-					int father = Rand(_populationSize), mother = Rand(_populationSize);
+					int father = Rand(populationSize), mother = Rand(populationSize);
 					offspring.Add(population[father].Crossover(population[mother], _numberOfCrossoverPoints, _crossoverProbability));
-					if((i + 1) < _populationSize)
+					if((i + 1) < populationSize)
 						offspring.Add(population[mother].Crossover(population[father], _numberOfCrossoverPoints, _crossoverProbability));
 				}
 			});