Bounds with steps

Smoren · Mar 26, 2024 · 7110b10 · 7110b10
1 parent 3bcf685
commit 7110b10
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/src/components/config-editor/components/config-bounds.vue b/src/components/config-editor/components/config-bounds.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 
 const props = withDefaults(defineProps<{
-  values: number[];
+  values: [number, number, number?];
   name: string;
   min?: number;
   max?: number;
@@ -21,6 +21,7 @@ const props = withDefaults(defineProps<{
       <tr>
         <td>min</td>
         <td>max</td>
+        <td v-if="values[2] !== undefined" width="33%">step</td>
       </tr>
       <tr>
         <td>
@@ -29,6 +30,9 @@ const props = withDefaults(defineProps<{
         <td>
           <input type="number" v-model="values[1]" :step="step" :min="min" :max="max">
         </td>
+        <td v-if="values[2] !== undefined">
+          <input type="number" v-model="values[2]" :min="0" :max="values[1] - values[0]">
+        </td>
       </tr>
     </table>
   </div>

diff --git a/src/lib/config/types.ts b/src/lib/config/types.ts
@@ -69,19 +69,21 @@ export function createRandomTypesConfig({
   LINK_BOUNDS,
   LINK_FACTOR_DISTANCE_BOUNDS,
 }: RandomTypesConfig): TypesConfig {
+  const precision = 8;
+
   const gravity: number[][] = [];
   for (let i=0; i<TYPES_COUNT; ++i) {
     gravity.push([]);
     for (let j=0; j<TYPES_COUNT; ++j) {
-      gravity[i].push(createRandomFloat(GRAVITY_BOUNDS, 2));
+      gravity[i].push(createRandomFloat(GRAVITY_BOUNDS, precision));
     }
   }
 
   const linkGravity: number[][] = [];
   for (let i=0; i<TYPES_COUNT; ++i) {
     linkGravity.push([]);
     for (let j=0; j<TYPES_COUNT; ++j) {
-      linkGravity[i].push(createRandomFloat(LINK_GRAVITY_BOUNDS, 2));
+      linkGravity[i].push(createRandomFloat(LINK_GRAVITY_BOUNDS, precision));
     }
   }
 
@@ -106,7 +108,7 @@ export function createRandomTypesConfig({
   for (let i=0; i<TYPES_COUNT; ++i) {
     linkFactorDistance.push([]);
     for (let j=0; j<TYPES_COUNT; ++j) {
-      linkFactorDistance[i].push(createRandomFloat(LINK_FACTOR_DISTANCE_BOUNDS, 2));
+      linkFactorDistance[i].push(createRandomFloat(LINK_FACTOR_DISTANCE_BOUNDS, precision));
     }
   }
 
@@ -129,10 +131,10 @@ export function createRandomTypesConfig({
 export function createDefaultRandomTypesConfig(typesCount: number): RandomTypesConfig {
   return {
     TYPES_COUNT: typesCount,
-    GRAVITY_BOUNDS: [-1, 0.5],
-    LINK_GRAVITY_BOUNDS: [-1, 0.5],
+    GRAVITY_BOUNDS: [-1, 0.5, 0.01],
+    LINK_GRAVITY_BOUNDS: [-1, 0.5, 0.01],
     LINK_BOUNDS: [1, 3],
     LINK_TYPE_BOUNDS: [0, 3],
-    LINK_FACTOR_DISTANCE_BOUNDS: [0.5, 1.5],
+    LINK_FACTOR_DISTANCE_BOUNDS: [0.5, 1.5, 0.01],
   };
 }
diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts
@@ -166,10 +166,17 @@ export function createRandomInteger([from, until]: [number, number]): number {
   return Math.round(Math.random() * (until - from)) + from;
 }
 
-export function createRandomFloat([from, until]: [number, number], precision?: number): number {
-  const result = Math.random() * (until - from) + from;
+export function createRandomFloat([from, until, step]: [number, number, number?], precision?: number): number {
+  let result = Math.random() * (until - from) + from;
+  if (step !== undefined) {
+    result = roundWithStep(result, step);
+  }
   if (precision !== undefined) {
-    return Number(result.toFixed(precision));
+    result = Number(result.toFixed(precision));
   }
   return result;
 }
+
+export function roundWithStep(value: number, step: number): number {
+  return Math.round(value / step) * step;
+}
diff --git a/src/lib/types/config.ts b/src/lib/types/config.ts
@@ -41,10 +41,10 @@ export type InitialConfig = {
 };
 export type RandomTypesConfig = {
   TYPES_COUNT: number;
-  GRAVITY_BOUNDS: [number, number];
-  LINK_GRAVITY_BOUNDS: [number, number];
+  GRAVITY_BOUNDS: [number, number, number?];
+  LINK_GRAVITY_BOUNDS: [number, number, number?];
   LINK_BOUNDS: [number, number];
   LINK_TYPE_BOUNDS: [number, number];
-  LINK_FACTOR_DISTANCE_BOUNDS: [number, number];
+  LINK_FACTOR_DISTANCE_BOUNDS: [number, number, number?];
 };
 
diff --git a/src/store/simulation.ts b/src/store/simulation.ts
@@ -1,11 +1,6 @@
 import { computed, type Ref, ref, watch } from "vue";
 import { defineStore } from "pinia";
-import type { InitialConfig, RandomTypesConfig, TypesConfig, WorldConfig } from "@/lib/types/config";
-import { createBaseWorldConfig } from "@/lib/config/world";
-import { createBaseTypesConfig, createDefaultRandomTypesConfig, createRandomTypesConfig } from "@/lib/config/types";
 import { create2dBaseInitialConfig, create3dBaseInitialConfig } from "@/lib/config/initial";
-import { fullCopyObject } from "@/helpers/utils";
-import { getRandomColor } from "@/lib/helpers";
 import { useConfigStore, type ViewMode } from "@/store/config";
 import { Simulation } from "@/lib/simulation";
 import { create2dRandomDistribution, create3dRandomDistribution } from "@/lib/config/atoms";