Main diagonal settings.

Smoren · Apr 30, 2024 · 4cd5c20 · 4cd5c20
1 parent a2e7d66
commit 4cd5c20
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 13 deletions.
diff --git a/src/components/config-editor/components/sections/randomize-config-section.vue b/src/components/config-editor/components/sections/randomize-config-section.vue
@@ -169,16 +169,28 @@ const randomizeTypesConfig = () => {
             :step="0.1"
             :values="randomTypesConfig.LINK_FACTOR_DISTANCE_BOUNDS"
           />
-          <flag
-            title="Symmetric"
-            v-model="randomTypesConfig.LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC"
-            style="float: left;"
-          />
-          <flag
-            title="Extended"
-            v-model="randomTypesConfig.LINK_FACTOR_DISTANCE_EXTENDED"
-            style="float: right;"
-          />
+          <div class="grid-wrapper">
+            <div>
+              <flag
+                title="Symmetric"
+                v-model="randomTypesConfig.LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC"
+              />
+            </div>
+            <div>
+              <flag
+                title="Ignore self type"
+                v-model="randomTypesConfig.LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE"
+                style="text-align: center;"
+              />
+            </div>
+            <div>
+              <flag
+                title="Extended"
+                v-model="randomTypesConfig.LINK_FACTOR_DISTANCE_EXTENDED"
+                style="text-align: right;"
+              />
+            </div>
+          </div>
         </div>
       </div>
 
@@ -202,4 +214,13 @@ const randomizeTypesConfig = () => {
   margin-right: 5px;
 }
 
+.grid-wrapper {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.grid-wrapper > div {
+  flex: 1 1;
+}
 </style>
diff --git a/src/lib/config/types.ts b/src/lib/config/types.ts
@@ -4,7 +4,9 @@ import {
   createRandomInteger,
   createDistributedLinkFactorDistance,
   getRandomColor,
-  randomizeMatrix
+  randomizeMatrix,
+  setMatrixMainDiagonal,
+  setTensorMainDiagonal,
 } from "@/lib/helpers";
 
 export function createColors(count: number): Array<ColorVector> {
@@ -90,6 +92,7 @@ export function createRandomTypesConfig({
   LINK_TYPE_MATRIX_SYMMETRIC,
   LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC,
   LINK_FACTOR_DISTANCE_EXTENDED,
+  LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE,
 }: RandomTypesConfig): TypesConfig {
   const precision = 8;
 
@@ -140,6 +143,10 @@ export function createRandomTypesConfig({
     precision,
   );
 
+  if (LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE) {
+    setMatrixMainDiagonal(linkFactorDistance, 1);
+  }
+
   let linkFactorDistanceExtended: number[][][] | undefined;
 
   if (LINK_FACTOR_DISTANCE_EXTENDED) {
@@ -153,6 +160,10 @@ export function createRandomTypesConfig({
         precision,
       ));
     }
+
+    if (LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE) {
+      setTensorMainDiagonal(linkFactorDistanceExtended, 1);
+    }
   }
 
   return {
@@ -194,5 +205,6 @@ export function createDefaultRandomTypesConfig(typesCount: number): RandomTypesC
     LINK_TYPE_MATRIX_SYMMETRIC: false,
     LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC: false,
     LINK_FACTOR_DISTANCE_EXTENDED: true,
+    LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE: true,
   };
 }
diff --git a/src/lib/example/variants/2d/random-types-distribution.ts b/src/lib/example/variants/2d/random-types-distribution.ts
@@ -35,7 +35,8 @@ const TYPES_CONFIG: TypesConfig = createRandomTypesConfig({
   LINK_GRAVITY_MATRIX_SYMMETRIC: false,
   LINK_TYPE_MATRIX_SYMMETRIC: false,
   LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC: false,
-  LINK_FACTOR_DISTANCE_EXTENDED: false,
+  LINK_FACTOR_DISTANCE_EXTENDED: true,
+  LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE: true,
 });
 const INITIAL_CONFIG: InitialConfig = create2dBaseInitialConfig();
 

diff --git a/src/lib/example/variants/3d/random-types-distribution.ts b/src/lib/example/variants/3d/random-types-distribution.ts
@@ -35,7 +35,8 @@ const TYPES_CONFIG: TypesConfig = createRandomTypesConfig({
   LINK_GRAVITY_MATRIX_SYMMETRIC: false,
   LINK_TYPE_MATRIX_SYMMETRIC: false,
   LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC: false,
-  LINK_FACTOR_DISTANCE_EXTENDED: false,
+  LINK_FACTOR_DISTANCE_EXTENDED: true,
+  LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE: true,
 });
 const INITIAL_CONFIG: InitialConfig = create3dBaseInitialConfig();
 

diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts
@@ -489,6 +489,20 @@ export function concatTensors(lhs: number[][][], rhs: number[][][], defaultValue
   return result;
 }
 
+export function setMatrixMainDiagonal<T>(matrix: T[][], value: T): T[][] {
+  for (let i=0; i<matrix.length; ++i) {
+    matrix[i][i] = value;
+  }
+  return matrix;
+}
+
+export function setTensorMainDiagonal<T>(tensor: T[][][], value: T): T[][][] {
+  for (let i=0; i<tensor.length; ++i) {
+    tensor[i][i][i] = value;
+  }
+  return tensor;
+}
+
 export function getViewModeConfig(worldConfig: WorldConfig, viewMode?: ViewMode): ViewModeConfig {
   return (viewMode ?? worldConfig.VIEW_MODE) === '3d'
     ? worldConfig.CONFIG_3D

diff --git a/src/lib/types/config.ts b/src/lib/types/config.ts
@@ -81,6 +81,7 @@ export type RandomTypesConfig = {
   LINK_TYPE_MATRIX_SYMMETRIC: boolean;
   LINK_FACTOR_DISTANCE_MATRIX_SYMMETRIC: boolean;
   LINK_FACTOR_DISTANCE_EXTENDED: boolean;
+  LINK_FACTOR_DISTANCE_IGNORE_SELF_TYPE: boolean;
 };
 export type TypesSymmetricConfig = {
   GRAVITY_MATRIX_SYMMETRIC: boolean;