upd

Smoren · Oct 10, 2024 · dcd5d4e · dcd5d4e
1 parent 76fc4f1
commit dcd5d4e
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/data/input/default-genetic-randomize-config.json b/data/input/default-genetic-randomize-config.json
@@ -9,6 +9,7 @@
   "USE_LINK_TYPE_BOUNDS": true,
   "USE_LINK_TYPE_WEIGHT_BOUNDS": true,
   "USE_LINK_FACTOR_DISTANCE_BOUNDS": true,
+  "USE_LINK_FACTOR_ELASTIC_BOUNDS": true,
 
   "RADIUS_BOUNDS": [0.8, 1.3, 1, 0.1],
   "FREQUENCY_BOUNDS": [0.1, 1, 0.5, 0.1],
@@ -17,12 +18,15 @@
   "LINK_BOUNDS": [1, 8, 4],
   "LINK_TYPE_BOUNDS": [0, 6, 3],
   "LINK_TYPE_WEIGHT_BOUNDS": [0.5, 2, 1, 0.5],
-  "LINK_FACTOR_DISTANCE_BOUNDS": [0.1, 1.2, 1, 0.1],
+  "LINK_FACTOR_DISTANCE_BOUNDS": [0.3, 1.2, 1, 0.1],
+  "LINK_FACTOR_ELASTIC_BOUNDS": [0.3, 1, 1, 0.1],
 
   "GRAVITY_MATRIX_SYMMETRIC": false,
   "LINK_GRAVITY_MATRIX_SYMMETRIC": false,
   "LINK_TYPE_MATRIX_SYMMETRIC": false,
   "LINK_TYPE_WEIGHT_MATRIX_SYMMETRIC": false,
   "LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC": true,
-  "LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE": true
+  "LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE": true,
+  "LINK_FACTOR_ELASTIC_MATRIX_SYMMETRIC": true,
+  "LINK_FACTOR_ELASTIC_IGNORE_SELF_TYPE": true
 }
diff --git a/data/input/default-genetic-reference-config.json b/data/input/default-genetic-reference-config.json
@@ -78,6 +78,23 @@
         [1.1, 0.7, 1]
       ]
     ],
+    "LINK_FACTOR_ELASTIC": [
+      [
+        [1, 1, 1],
+        [1, 1, 1],
+        [1, 1, 1]
+      ],
+      [
+        [1, 1, 1],
+        [1, 1, 1],
+        [1, 1, 1]
+      ],
+      [
+        [1, 1, 1],
+        [1, 1, 1],
+        [1, 1, 1]
+      ]
+    ],
     "FREQUENCIES": [1, 1, 1],
     "COLORS": [
       [250, 20, 20],
@@ -90,6 +107,7 @@
     "GRAVITY_MATRIX_SYMMETRIC": false,
     "LINK_GRAVITY_MATRIX_SYMMETRIC": false,
     "LINK_TYPE_MATRIX_SYMMETRIC": false,
-    "LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC": true
+    "LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC": true,
+    "LINK_FACTOR_ELASTIC_MATRIX_SYMMETRIC": true
   }
 }
diff --git a/data/input/default-genetic-source-config.json b/data/input/default-genetic-source-config.json
@@ -80,6 +80,23 @@
         [1, 1, 1]
       ]
     ],
+    "LINK_FACTOR_ELASTIC": [
+      [
+        [1, 1, 1],
+        [1, 1, 1],
+        [1, 1, 1]
+      ],
+      [
+        [1, 1, 1],
+        [1, 1, 1],
+        [1, 1, 1]
+      ],
+      [
+        [1, 1, 1],
+        [1, 1, 1],
+        [1, 1, 1]
+      ]
+    ],
     "FREQUENCIES": [1, 1, 1],
     "COLORS": [
       [250, 20, 20],
@@ -92,6 +109,7 @@
     "GRAVITY_MATRIX_SYMMETRIC": false,
     "LINK_GRAVITY_MATRIX_SYMMETRIC": false,
     "LINK_TYPE_MATRIX_SYMMETRIC": false,
-    "LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC": false
+    "LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC": false,
+    "LINK_FACTOR_ELASTIC_MATRIX_SYMMETRIC": false
   }
 }