TournamentSelectionStrategy added.

Smoren · Jan 26, 2025 · 4cfa03a · 4cfa03a
1 parent 98d9508
commit 4cfa03a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/tests/parabola/multiprocess.test.ts b/tests/parabola/multiprocess.test.ts
@@ -42,7 +42,7 @@ describe('Parabola Multiprocessing', () => {
       }),
       fitness: new ParabolaMaxValueFitnessStrategy(),
       sorting: new DescendingSortingStrategy(),
-      selection: new RandomSelectionStrategy(2),
+      selection: new RandomSelectionStrategy<ParabolaArgumentGenome>(2),
       mutation: new ParabolaMutationStrategy(),
       crossover: new ParabolaCrossoverStrategy(),
       cache: new DummyPhenomeCache(),
@@ -86,7 +86,7 @@ describe('Parabola Multiprocessing', () => {
       }),
       fitness: new ParabolaMaxValueFitnessStrategy(),
       sorting: new DescendingSortingStrategy(),
-      selection: new RandomSelectionStrategy(2),
+      selection: new RandomSelectionStrategy<ParabolaArgumentGenome>(2),
       mutation: new ParabolaMutationStrategy(),
       crossover: new ParabolaCrossoverStrategy(),
       cache: new SimplePhenomeCache(),
@@ -136,7 +136,7 @@ describe('Parabola Multiprocessing', () => {
       }),
       fitness: new ParabolaMaxValueFitnessStrategy(),
       sorting: new DescendingSortingStrategy(),
-      selection: new RandomSelectionStrategy(2),
+      selection: new RandomSelectionStrategy<ParabolaArgumentGenome>(2),
       mutation: new ParabolaMutationStrategy(),
       crossover: new ParabolaCrossoverStrategy(),
       cache: new DummyPhenomeCache(),
@@ -186,7 +186,7 @@ describe('Parabola Multiprocessing', () => {
       }),
       fitness: new ParabolaMaxValueFitnessStrategy(),
       sorting: new DescendingSortingStrategy(),
-      selection: new RandomSelectionStrategy(2),
+      selection: new RandomSelectionStrategy<ParabolaArgumentGenome>(2),
       mutation: new ParabolaMutationStrategy(),
       crossover: new ParabolaCrossoverStrategy(),
       cache: new SimplePhenomeCache(),

diff --git a/tests/traveling/multiprocess.test.ts b/tests/traveling/multiprocess.test.ts
@@ -10,6 +10,7 @@ import {
   SimplePhenomeCache,
   DescendingSortingStrategy,
   RandomSelectionStrategy,
+  TournamentSelectionStrategy,
 } from "genetic-search";
 import {
   calcPathDistance,
@@ -57,7 +58,7 @@ describe.each([
         }),
         fitness: new TravelingFitnessStrategy(),
         sorting: new DescendingSortingStrategy(),
-        selection: new RandomSelectionStrategy(2),
+        selection: new TournamentSelectionStrategy<TravelingGenome>(2, 5),
         mutation: new TravelingMutationStrategy(),
         crossover: new TravelingCrossoverStrategy(),
         cache: new DummyPhenomeCache(),
@@ -110,7 +111,7 @@ describe.each([
         fitness: new TravelingFitnessStrategy(),
         sorting: new DescendingSortingStrategy(),
         mutation: new TravelingMutationStrategy(),
-        selection: new RandomSelectionStrategy(2),
+        selection: new RandomSelectionStrategy<TravelingGenome>(2),
         crossover: new TravelingCrossoverStrategy(),
         cache: new SimplePhenomeCache(),
       }
@@ -168,7 +169,7 @@ describe.each([
         }),
         fitness: new TravelingFitnessStrategy(),
         sorting: new DescendingSortingStrategy(),
-        selection: new RandomSelectionStrategy(2),
+        selection: new TournamentSelectionStrategy<TravelingGenome>(2, 5),
         mutation: new TravelingMutationStrategy(),
         crossover: new TravelingCrossoverStrategy(),
         cache: new DummyPhenomeCache(),
@@ -228,7 +229,7 @@ describe.each([
         fitness: new TravelingFitnessStrategy(),
         sorting: new DescendingSortingStrategy(),
         mutation: new TravelingMutationStrategy(),
-        selection: new RandomSelectionStrategy(2),
+        selection: new RandomSelectionStrategy<TravelingGenome>(2),
         crossover: new TravelingCrossoverStrategy(),
         cache: new AveragePhenomeCache(),
       }