In progress...

src/lib/config/atoms.ts

@@ -1,10 +1,6 @@
 import type { AtomInterface } from '../types/atomic';
 import { createAtom, getIndexByFrequencies } from '../helpers';
-import type {
-  InitialConfig,
-  TypesConfig,
-  WorldConfig,
-} from '../types/config';
+import type { TypesConfig, WorldConfig } from '../types/config';
 
 export function create2dButterfly(): AtomInterface[] {
   const atoms: AtomInterface[] = [];
@@ -39,15 +35,13 @@ export function create3dButterfly(): AtomInterface[] {
 export function create2dRandomDistribution(
   worldConfig: WorldConfig,
   typesConfig: TypesConfig,
-  initialConfig: InitialConfig,
 ): AtomInterface[] {
   const atoms: AtomInterface[] = [];
 
-  for (let i = 0; i < initialConfig.ATOMS_COUNT; ++i) {
+  for (let i = 0; i < worldConfig.CONFIG_2D.INITIAL.ATOMS_COUNT; ++i) {
     const type = getIndexByFrequencies(typesConfig.FREQUENCIES);
-    // const type = Math.round(Math.random() * (typesConfig.COLORS.length - 1));
-    const minPos = initialConfig.MIN_POSITION;
-    const maxPos = initialConfig.MAX_POSITION;
+    const minPos = worldConfig.CONFIG_2D.INITIAL.MIN_POSITION;
+    const maxPos = worldConfig.CONFIG_2D.INITIAL.MAX_POSITION;
 
     const position = [
       minPos[0] + Math.random() * (maxPos[0] - minPos[0]),
@@ -62,15 +56,13 @@ export function create2dRandomDistribution(
 export function create3dRandomDistribution(
   worldConfig: WorldConfig,
   typesConfig: TypesConfig,
-  initialConfig: InitialConfig,
 ): AtomInterface[] {
   const atoms: AtomInterface[] = [];
 
-  for (let i = 0; i < initialConfig.ATOMS_COUNT; ++i) {
+  for (let i = 0; i < worldConfig.CONFIG_3D.INITIAL.ATOMS_COUNT; ++i) {
     const type = getIndexByFrequencies(typesConfig.FREQUENCIES);
-    // const type = Math.round(Math.random() * (typesConfig.COLORS.length - 1));
-    const minPos = initialConfig.MIN_POSITION;
-    const maxPos = initialConfig.MAX_POSITION;
+    const minPos = worldConfig.CONFIG_3D.INITIAL.MIN_POSITION;
+    const maxPos = worldConfig.CONFIG_3D.INITIAL.MAX_POSITION;
 
     const position = [
       minPos[0] + Math.random() * (maxPos[0] - minPos[0]),

src/lib/config/world.ts

@@ -23,12 +23,22 @@ export function createBaseWorldConfig(): WorldConfig {
         MIN_POSITION: [0, 0],
         MAX_POSITION: [2500, 2500],
       },
+      INITIAL: {
+        ATOMS_COUNT: 2000,
+        MIN_POSITION: [0, 0],
+        MAX_POSITION: [2500, 2000],
+      },
     },
     CONFIG_3D: {
       BOUNDS: {
         MIN_POSITION: [0, 0, 0],
         MAX_POSITION: [500, 500, 500],
       },
+      INITIAL: {
+        ATOMS_COUNT: 1000,
+        MIN_POSITION: [0, 0, 0],
+        MAX_POSITION: [500, 500, 500],
+      },
     },
     TEMPERATURE_FUNCTION: (c: NumericVector, t: number) => {
       return 1;

src/lib/example/variants/2d/butterfly.ts

@@ -17,6 +17,7 @@ const INITIAL_CONFIG: InitialConfig = create2dBaseInitialConfig();
 
 export function create2dSimulationButterfly() {
   return new Simulation({
+    viewMode: '2d',
     worldConfig: WORLD_CONFIG,
     typesConfig: TYPES_CONFIG,
     initialConfig: INITIAL_CONFIG,

src/lib/example/variants/2d/const-types-distribution.ts

@@ -17,6 +17,7 @@ const INITIAL_CONFIG: InitialConfig = create2dBaseInitialConfig();
 
 export function create2dSimulationWithConstTypes() {
   return new Simulation({
+    viewMode: '2d',
     worldConfig: WORLD_CONFIG,
     typesConfig: TYPES_CONFIG,
     initialConfig: INITIAL_CONFIG,

src/lib/example/variants/2d/random-types-distribution.ts

@@ -41,6 +41,7 @@ const INITIAL_CONFIG: InitialConfig = create2dBaseInitialConfig();
 
 export function create2dSimulationWithRandomTypes() {
   return new Simulation({
+    viewMode: '2d',
     worldConfig: WORLD_CONFIG,
     typesConfig: TYPES_CONFIG,
     initialConfig: INITIAL_CONFIG,

src/lib/example/variants/3d/butterfly.ts

@@ -17,6 +17,7 @@ const INITIAL_CONFIG: InitialConfig = create3dBaseInitialConfig();
 
 export function create3dSimulationButterfly() {
   return new Simulation({
+    viewMode: '3d',
     worldConfig: WORLD_CONFIG,
     typesConfig: TYPES_CONFIG,
     initialConfig: INITIAL_CONFIG,

src/lib/example/variants/3d/const-types-distribution.ts

@@ -17,6 +17,7 @@ const INITIAL_CONFIG: InitialConfig = create3dBaseInitialConfig();
 
 export function create3dSimulationWithConstTypes() {
   return new Simulation({
+    viewMode: '3d',
     worldConfig: WORLD_CONFIG,
     typesConfig: TYPES_CONFIG,
     initialConfig: INITIAL_CONFIG,

src/lib/example/variants/3d/random-types-distribution.ts

@@ -41,6 +41,7 @@ const INITIAL_CONFIG: InitialConfig = create3dBaseInitialConfig();
 
 export function create3dSimulationWithRandomTypes() {
   return new Simulation({
+    viewMode: '3d',
     worldConfig: WORLD_CONFIG,
     typesConfig: TYPES_CONFIG,
     initialConfig: INITIAL_CONFIG,

src/lib/simulation.ts

@@ -5,9 +5,8 @@ import type { LinkManagerInterface, RunningStateInterface } from './types/helper
 import type { InteractionManagerInterface, PhysicModelInterface } from './types/interaction';
 import type { ClusterManagerInterface } from './types/cluster';
 import type { Summary, SummaryManagerInterface } from './types/summary';
-import type { InitialConfig } from './types/config';
 import { ClusterManager } from './cluster';
-import { createAtom, LinkManager, RulesHelper, RunningState } from './helpers';
+import { createAtom, getViewModeConfig, LinkManager, RulesHelper, RunningState } from './helpers';
 import { InteractionManager } from './interaction';
 import { SummaryManager } from './summary';
 import type { NumericVector } from './vector/types';
@@ -24,7 +23,7 @@ export class Simulation implements SimulationInterface {
 
   constructor(config: SimulationConfig) {
     this.config = config;
-    this.atoms = this.config.atomsFactory(this.config.worldConfig, this.config.typesConfig, this.config.initialConfig);
+    this.atoms = this.config.atomsFactory(this.config.worldConfig, this.config.typesConfig);
     this.drawer = this.config.drawer;
     this.linkManager = new LinkManager();
     this.interactionManager = new InteractionManager(
@@ -69,12 +68,11 @@ export class Simulation implements SimulationInterface {
     this.runningState.togglePause();
   }
 
-  refill(initialConfig?: InitialConfig) {
+  refill() {
     this.clear();
     this.atoms = this.config.atomsFactory(
       this.config.worldConfig,
       this.config.typesConfig,
-      initialConfig ?? this.config.initialConfig
     );
   }
 

src/lib/types/config.ts

@@ -16,8 +16,14 @@ export type BoundsConfig = {
   MIN_POSITION: NumericVector;
   MAX_POSITION: NumericVector;
 };
+export type InitialConfig = {
+  ATOMS_COUNT: number;
+  MIN_POSITION: NumericVector;
+  MAX_POSITION: NumericVector;
+};
 export type ViewModeConfig = {
   BOUNDS: BoundsConfig;
+  INITIAL: InitialConfig;
 };
 export type TypesConfig = {
   RADIUS: RadiusConfig;
@@ -51,11 +57,6 @@ export type WorldConfig = {
   CONFIG_2D: ViewModeConfig;
   CONFIG_3D: ViewModeConfig;
 };
-export type InitialConfig = {
-  ATOMS_COUNT: number;
-  MIN_POSITION: NumericVector;
-  MAX_POSITION: NumericVector;
-};
 export type RandomTypesConfig = {
   TYPES_COUNT: number;
 

src/lib/types/simulation.ts

@@ -13,7 +13,6 @@ export type SimulationConfig = {
   atomsFactory: (
     worldConfig: WorldConfig,
     typesConfig: TypesConfig,
-    initialConfig: InitialConfig
   ) => AtomInterface[];
   drawer: DrawerInterface;
 };
@@ -25,7 +24,7 @@ export interface SimulationInterface {
   start(): void;
   stop(onStop?: () => void): Promise<void>;
   togglePause(): void;
-  refill(initialConfig?: InitialConfig): void;
+  refill(): void;
   clear(): void;
   setPhysicModel(model: PhysicModelInterface): void;
   exportState(): Promise<Record<string, unknown>>;

src/store/simulation.ts

@@ -1,4 +1,4 @@
-import { computed, watch } from "vue";
+import { computed } from "vue";
 import { defineStore } from "pinia";
 import type { SimulationInterface } from "@/lib/types/simulation";
 import type { PhysicModelInterface } from '@/lib/types/interaction';
@@ -16,7 +16,6 @@ export const useSimulationStore = defineStore("simulation", () => {
   const {
     worldConfig,
     typesConfig,
-    initialConfig,
   } = configStore.getConfigValues();
 
   let simulation2d: Simulation | null = null;
@@ -96,11 +95,8 @@ export const useSimulationStore = defineStore("simulation", () => {
 
   const refillAtoms = (globally: boolean = false) => {
     if (globally) {
-      const initialConfig2d = isMode('2d') ? configStore.initialConfig : create2dBaseInitialConfig();
-      const initialConfig3d = isMode('3d') ? configStore.initialConfig : create3dBaseInitialConfig();
-
-      simulation2d?.refill(initialConfig2d);
-      simulation3d?.refill(initialConfig3d);
+      simulation2d?.refill();
+      simulation3d?.refill();
     } else {
       getCurrentSimulation().refill();
     }