diff --git a/src/app/editor/gamesystem-editor/gamesystem-editor.component.html b/src/app/editor/gamesystem-editor/gamesystem-editor.component.html
index c32d36c..81b08a1 100644
--- a/src/app/editor/gamesystem-editor/gamesystem-editor.component.html
+++ b/src/app/editor/gamesystem-editor/gamesystem-editor.component.html
@@ -1,6 +1,14 @@
-
- Gamesystem is symmetric template
-
+
+
+
+
+ Product Generation Settings
+
+
+ Use symmetric Productgenerators
+
+ Generate Isolated ProductStates
+
diff --git a/src/app/editor/gamesystem-editor/product-gamesystem-editor/product-gamesystem-editor.component.html b/src/app/editor/gamesystem-editor/product-gamesystem-editor/product-gamesystem-editor.component.html
index fde7130..b812aca 100644
--- a/src/app/editor/gamesystem-editor/product-gamesystem-editor/product-gamesystem-editor.component.html
+++ b/src/app/editor/gamesystem-editor/product-gamesystem-editor/product-gamesystem-editor.component.html
@@ -1,4 +1,4 @@
-Generate Isolated States
+
diff --git a/src/app/editor/gamesystem-editor/product-gamesystem-editor/product-gamesystem-editor.component.ts b/src/app/editor/gamesystem-editor/product-gamesystem-editor/product-gamesystem-editor.component.ts
index 29319ca..e96554b 100644
--- a/src/app/editor/gamesystem-editor/product-gamesystem-editor/product-gamesystem-editor.component.ts
+++ b/src/app/editor/gamesystem-editor/product-gamesystem-editor/product-gamesystem-editor.component.ts
@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import {
ProductTransitionEditorComponent
} from "../transition-editor/product-transition-editor/product-transition-editor.component";
@@ -13,12 +13,15 @@ import {TemplateElement} from "../../../project/game-model/templates/TemplateEle
templateUrl: './product-gamesystem-editor.component.html',
styleUrl: './product-gamesystem-editor.component.scss'
})
-export class ProductGamesystemEditorComponent {
+export class ProductGamesystemEditorComponent implements OnInit{
@Input() gamesystem: ProductGamesystem | undefined
@Input() templateElement: TemplateElement | undefined
@Output("onOpenGamesystemEditor") openGamesystemEditorEmitter = new EventEmitter
();
+ ngOnInit() {
+ }
+
onOpenGamesystemEditor(gamesystem: SimpleGamesystem) {
this.openGamesystemEditorEmitter.emit(gamesystem);
}
diff --git a/src/app/editor/gamesystem-editor/state-editor/product-state-editor/product-state-editor.component.ts b/src/app/editor/gamesystem-editor/state-editor/product-state-editor/product-state-editor.component.ts
index 1c7a7e8..ab1168d 100644
--- a/src/app/editor/gamesystem-editor/state-editor/product-state-editor/product-state-editor.component.ts
+++ b/src/app/editor/gamesystem-editor/state-editor/product-state-editor/product-state-editor.component.ts
@@ -50,6 +50,7 @@ export class ProductStateEditorComponent implements OnInit{
if(this.templateElement == undefined) {
this.datasource.data = this.gamesystem!.states;
} else if(this.gamesystem instanceof ProductTemplateSystem) {
+ console.log("Product Template System: ", this.gamesystem!.stateMap.get(this.templateElement))
this.datasource.data = this.gamesystem!.stateMap.get(this.templateElement)!
}
diff --git a/src/app/project/game-model/characters/CharacterRelation.ts b/src/app/project/game-model/characters/CharacterRelation.ts
index ea9ecb1..fe1307a 100644
--- a/src/app/project/game-model/characters/CharacterRelation.ts
+++ b/src/app/project/game-model/characters/CharacterRelation.ts
@@ -22,6 +22,7 @@ export class CharacterRelation implements TemplateElement{
if((gamesystem instanceof SimpleTemplateGamesystem || gamesystem instanceof ProductTemplateSystem) && !this.isGamesystemCharacterRelationSpecific(gamesystem.componentName)) {
const templateGamesystem = new ProductTemplateSystem(gamesystem.componentName, gamesystem.componentDescription, TemplateType.CHARACTER_RELATION);
templateGamesystem.symmetric = gamesystem.symmetric
+ templateGamesystem.generateIsolatedStates = gamesystem.generateIsolatedStates
templateGamesystem.addChildGamesystem(gamesystem);
templateGamesystem.addChildGamesystem(gamesystem);
this.characterRelationGamesystems.push(templateGamesystem);
diff --git a/src/app/project/game-model/gamesystems/Gamesystem.ts b/src/app/project/game-model/gamesystems/Gamesystem.ts
index 2e94174..d08bbf2 100644
--- a/src/app/project/game-model/gamesystems/Gamesystem.ts
+++ b/src/app/project/game-model/gamesystems/Gamesystem.ts
@@ -8,6 +8,8 @@ export abstract class Gamesystem extends ModelComponent{
states: S[] = [];
transitions: T[] = [];
parentGamesystem: ProductGamesystem | undefined
+ generateIsolatedStates: boolean = true
+
constructor(gamesystemName: string, gamesystemDescription: string) {
super(gamesystemName, gamesystemDescription, ModelComponentType.GAMESYTEM);
}
diff --git a/src/app/project/game-model/gamesystems/ProductGamesystem.ts b/src/app/project/game-model/gamesystems/ProductGamesystem.ts
index 00889a5..2b77cdc 100644
--- a/src/app/project/game-model/gamesystems/ProductGamesystem.ts
+++ b/src/app/project/game-model/gamesystems/ProductGamesystem.ts
@@ -16,7 +16,6 @@ import {IsolatedProductStateGenerator} from "./productSystemGenerator/IsolatedPr
export class ProductGamesystem extends Gamesystem {
innerGamesystems: Gamesystem, Transition>[] = [];
- generateIsolatedStates: boolean = false
static constructFromSimpleGamesystem(simpleGamesystem: SimpleGamesystem, gameModel: GameModel) {
const productGamesystem = new ProductGamesystem(simpleGamesystem.componentName, simpleGamesystem.componentDescription);
diff --git a/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedProductStateGenerator.ts b/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedProductStateGenerator.ts
index 3577424..db982a9 100644
--- a/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedProductStateGenerator.ts
+++ b/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedProductStateGenerator.ts
@@ -28,7 +28,8 @@ export class IsolatedProductStateGenerator extends ProductSystemGenerator {
protected assignGeneratedStatesAndTransitions(generationResult: ProductGeneratorResult) {
- this.productGamesystem.states = generationResult.states;
+ this.productGamesystem.states = this.productGamesystem.states.concat(generationResult.states);
+ console.log("Generation-Result: ", this.productGamesystem.states)
}
protected generateBinaryIsolatedProductStates(leftSystemData: ProductGenerationData, rightSystemData: ProductGenerationData): ProductGeneratorResult {
diff --git a/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedSymmetricTemplateStateGenerator.ts b/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedSymmetricTemplateStateGenerator.ts
index d0032ec..e9301c2 100644
--- a/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedSymmetricTemplateStateGenerator.ts
+++ b/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedSymmetricTemplateStateGenerator.ts
@@ -2,21 +2,42 @@ import {IsolatedTemplateStateGenerator} from "./IsolatedTemplateStateGenerator";
import {ProductGenerationData} from "./ProductGenerationData";
import {ProductGeneratorResult} from "./ProductGeneratorResult";
import {ProductState} from "../states/ProductState";
+import {SimpleState} from "../states/SimpleState";
+import {State} from "../states/State";
+import {ScriptAccountCondition} from "../conditions/ScriptAccountCondition";
export class IsolatedSymmetricTemplateStateGenerator extends IsolatedTemplateStateGenerator{
protected generateBinaryIsolatedProductStates(leftSystemData: ProductGenerationData, rightSystemData: ProductGenerationData): ProductGeneratorResult {
+ console.log("Calling test")
+
+ console.log(leftSystemData.states)
+ console.log(rightSystemData.states)
+
const generatedProductStates: ProductState[] = []
leftSystemData.states.forEach(leftState => {
if(leftState.outgoingTransitions.length == 0 && leftState.incomingTransitions.length == 0) {
rightSystemData.states.forEach(rightState => {
+ console.log("LeftState is isolated")
+ if(leftState.equals(rightState)) {
+ if(rightState.outgoingTransitions.length == 0 && rightState.incomingTransitions.length == 0) {
+ const leftConditions = this.getStateConditions(leftState, true);
+ const rightConditions = this.getStateConditions(rightState, true);
+
+ if(!this.contradictCombinedConditions(leftConditions, rightConditions)) {
+ this.generateBinaryProductState(leftState, rightState, generatedProductStates);
+ }
+ }
+ }
+
if(leftState.equals(rightState) && rightState.outgoingTransitions.length == 0 && rightState.incomingTransitions.length == 0) {
const leftConditions = this.getStateConditions(leftState, true);
const rightConditions = this.getStateConditions(rightState, true);
if(!this.contradictCombinedConditions(leftConditions, rightConditions)) {
- this.generateBinaryProductState(leftState, rightState, generatedProductStates);
+ const generatedState = this.generateBinaryProductState(leftState, rightState, generatedProductStates);
+ console.log(generatedProductStates)
}
}
})
diff --git a/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedTemplateStateGenerator.ts b/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedTemplateStateGenerator.ts
index b9244a4..ad2fe31 100644
--- a/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedTemplateStateGenerator.ts
+++ b/src/app/project/game-model/gamesystems/productSystemGenerator/IsolatedTemplateStateGenerator.ts
@@ -8,6 +8,8 @@ import {Character} from "../../characters/Character";
import {CharacterRelation} from "../../characters/CharacterRelation";
import {TemplateElement} from "../../templates/TemplateElement";
import {ProductTemplateSystem} from "../../templates/productGamesystem/ProductTemplateSystem";
+import {ProductGeneratorResult} from "./ProductGeneratorResult";
+import {state, transition} from "@angular/animations";
export class IsolatedTemplateStateGenerator extends IsolatedProductStateGenerator {
templateElement: TemplateElement
@@ -18,6 +20,13 @@ export class IsolatedTemplateStateGenerator extends IsolatedProductStateGenerato
}
+ protected assignGeneratedStatesAndTransitions(generationResult: ProductGeneratorResult) {
+ const templateSystem = this.productGamesystem as ProductTemplateSystem;
+
+ const nonIsolatedStates = templateSystem.stateMap.get(this.templateElement)!
+ const states = nonIsolatedStates.concat(generationResult.states);
+ templateSystem.stateMap.set(this.templateElement, states)
+ }
protected getTransitionConditions(transition: Transition, leftSystem: boolean) {
const templateElement = this.determineTemplateElement(leftSystem)!;
diff --git a/src/app/project/game-model/templates/productGamesystem/ProductTemplateSystem.ts b/src/app/project/game-model/templates/productGamesystem/ProductTemplateSystem.ts
index 23b7783..1c8fa26 100644
--- a/src/app/project/game-model/templates/productGamesystem/ProductTemplateSystem.ts
+++ b/src/app/project/game-model/templates/productGamesystem/ProductTemplateSystem.ts
@@ -35,7 +35,11 @@ export class ProductTemplateSystem extends ProductGamesystem implements Template
if(this.generateIsolatedStates) {
const isolatedTemplateStateGenerator = new IsolatedSymmetricTemplateStateGenerator(this, templateElement);
- isolatedTemplateStateGenerator.generateFromChildsystems();
+ isolatedTemplateStateGenerator.generateIsolatedProductStates();
+ console.log(this.states)
+ console.log("Generate symmetric isolated states")
+ } else {
+ console.log("Do not generate symmetric isolated states")
}
} else {
const productTemplateGenerator = new TemplateProductSystemGenerator(this, templateElement);
diff --git a/testModel/characters/Hicks Haddock.json b/testModel/characters/Hicks Haddock.json
index debd75a..8f7bf3a 100644
--- a/testModel/characters/Hicks Haddock.json
+++ b/testModel/characters/Hicks Haddock.json
@@ -17,6 +17,18 @@
{
"stateLabel": "Fester Freund",
"conditionMap": []
+ },
+ {
+ "stateLabel": "Eltern",
+ "conditionMap": []
+ },
+ {
+ "stateLabel": "Geschwister",
+ "conditionMap": []
+ },
+ {
+ "stateLabel": "Großeltern",
+ "conditionMap": []
}
],
"transitions": [
@@ -45,6 +57,7 @@
"actionMap": []
}
],
+ "generateIsolatedStates": true,
"symmetric": true
}
]
diff --git a/testModel/gamesystems/Characterbeziehungssystem.json b/testModel/gamesystems/Characterbeziehungssystem.json
index ad1b1b4..8ad03fd 100644
--- a/testModel/gamesystems/Characterbeziehungssystem.json
+++ b/testModel/gamesystems/Characterbeziehungssystem.json
@@ -19,6 +19,24 @@
"conditions": [],
"stateLabel": "Fester Freund",
"stateDescription": ""
+ },
+ {
+ "initial": false,
+ "conditions": [],
+ "stateLabel": "Eltern",
+ "stateDescription": ""
+ },
+ {
+ "initial": false,
+ "conditions": [],
+ "stateLabel": "Geschwister",
+ "stateDescription": ""
+ },
+ {
+ "initial": false,
+ "conditions": [],
+ "stateLabel": "Großeltern",
+ "stateDescription": ""
}
],
"transitions": [
@@ -47,6 +65,7 @@
"endingState": "Feind"
}
],
+ "generateIsolatedStates": true,
"symmetric": true,
"templateType": 1
}
\ No newline at end of file