More fast stop

Smoren · Dec 5, 2024 · 798aac4 · 798aac4
1 parent 0c0e32a
commit 798aac4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "molecular-ts",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "private": true,
   "scripts": {
     "dev": "vite",

diff --git a/src/web/components/config-editor/components/sections/genetic-section.vue b/src/web/components/config-editor/components/sections/genetic-section.vue
@@ -47,6 +47,8 @@ const progress = computed(() => {
   return genomesHandled.value / totalCount * 100;
 });
 
+class StopException extends Error {}
+
 function createAlgo() {
   const typesCount = configStore.typesConfig.FREQUENCIES.length;
   const worldConfig = fullCopyObject(configStore.worldConfig);
@@ -66,6 +68,9 @@ function createAlgo() {
     onTaskResult: (metrics) => {
       console.log('genome handled', metrics);
       genomesHandled.value++;
+      if (needStop.value) {
+        throw new StopException();
+      }
     } // TODO TTaskConfig to input
   };
   const weightsConfig: ClusterizationWeightsConfig = createDefaultClusterizationWeightsConfig();
@@ -122,17 +127,23 @@ function stopAlgo() {
 async function runAlgoStep(algo: GeneticSearch<SimulationGenome>) {
   genomesHandled.value = 0;
 
-  await algo.fitStep();
-  algo.clearCache();
+  try {
+    await algo.fitStep();
+    algo.clearCache();
 
-  bestGenome.value = algo.bestGenome;
-  generation.value = algo.generation;
+    bestGenome.value = algo.bestGenome;
+    generation.value = algo.generation;
 
-  const scores = algo.population.map((x) => x.stats!.fitness);
-  averageScore.value = arraySum(scores) / scores.length;
+    const scores = algo.population.map((x) => x.stats!.fitness);
+    averageScore.value = arraySum(scores) / scores.length;
 
-  console.log(`Generation ${algo.generation}`, algo.bestGenome, algo.bestGenome.stats);
-  console.log('Fitness', algo.population.map((x) => x.stats!.fitness));
+    console.log(`Generation ${algo.generation}`, algo.bestGenome, algo.bestGenome.stats);
+    console.log('Fitness', algo.population.map((x) => x.stats!.fitness));
+  } catch (e) {
+    if (!(e instanceof StopException)) {
+      throw e;
+    }
+  }
 
   if (needStop.value) {
     isStarted.value = false;