From 530cc5ea67f22ac5b7d5605bdafed1ab9ae49384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Tue, 19 Mar 2024 11:11:05 +0100
Subject: [PATCH] Consider state conditions in product state generation

---
 .../gamesystems/ProductGamesystem.ts          | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/app/game-model/gamesystems/ProductGamesystem.ts b/src/app/game-model/gamesystems/ProductGamesystem.ts
index 01d7d1f..efdadf4 100644
--- a/src/app/game-model/gamesystems/ProductGamesystem.ts
+++ b/src/app/game-model/gamesystems/ProductGamesystem.ts
@@ -150,6 +150,15 @@ export class ProductGamesystem extends Gamesystem<ProductState, ProductTransitio
   }
 
   generateBinaryProductState(leftInnerState: State<any>, rightInnerState: State<any>, left_temp: boolean) {
+    const combinedStateConditions: ScriptAccountCondition[] = leftInnerState.conditions.concat(rightInnerState.conditions)
+    for(let i=0; i<combinedStateConditions.length; i++) {
+      for(let j=0; j<combinedStateConditions.length; j++) {
+        if(combinedStateConditions[i].isContradicting(combinedStateConditions[j])) {
+          return undefined
+        }
+      }
+    }
+
     let innerStates: State<any>[] = [];
     if(!left_temp) {
       innerStates = [leftInnerState, rightInnerState];
@@ -168,16 +177,8 @@ export class ProductGamesystem extends Gamesystem<ProductState, ProductTransitio
     let productInitial = true;
     binary_productState.innerStates.forEach(innerState => productInitial = productInitial && innerState.initial)
     binary_productState!.initial = productInitial
+    binary_productState.conditions = combinedStateConditions
 
-    const combinedStateConditions: ScriptAccountCondition[] = leftInnerState.conditions.concat(rightInnerState.conditions)
-    const conditionsContradicting = false
-    for(let i=0; i<combinedStateConditions.length; i++) {
-      for(let j=0; j<combinedStateConditions.length; j++) {
-        if(combinedStateConditions[i].isContradicting(combinedStateConditions[j])) {
-          return undefined
-        }
-      }
-    }
     return binary_productState!;
   }