Removed how to layout

renatav · Feb 8, 2017 · 3f59522 · 3f59522
1 parent 19eec66
commit 3f59522
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/GraphLayoutDSL/src/app/App.java b/GraphLayoutDSL/src/app/App.java
@@ -8,7 +8,7 @@ public class App {
 	public static void main(String[] args) {
 
 
-		String subgraphsExample = "lay out subgraph v1, v2 algorithm Kamada Kawai length factor = 5;subgraph v3, v4 style symmetric; others criteria  minimize bands, planar";
+		String subgraphsExample = "lay out graph criteria minimize edge crossings";
 		ILayout result = Interpreter.getInstance().execute(subgraphsExample);
 		System.out.println(result);
 	}

diff --git a/GraphLayoutDSL/src/interpreter/Interpreter.py b/GraphLayoutDSL/src/interpreter/Interpreter.py
@@ -60,9 +60,15 @@ def execute(self, model_str):
 
     @staticmethod
     def execute_one(layout, graph):
-            layoutType = layout.howToLayout
+
+            if layout.__class__.__name__ == "LayoutStyle":
+                layoutType = "style"
+            elif layout.__class__.__name__ == "LayoutAlgorithm":
+                layoutType = "algorithm"
+            else:
+                layoutType = "criteria"
 
-            if layoutType== 'algorithm':
+            if layoutType == 'algorithm':
                 #a map that will contain all information about the algorithm
                 algorithmProperties = {}
                 algorithm = layout.algorithm

diff --git a/GraphLayoutDSL/src/language/layout.tx b/GraphLayoutDSL/src/language/layout.tx
@@ -24,19 +24,19 @@ LayoutEnum:
 ;
 
 LayoutStyle:
-	howToLayout = 'style' style = LayoutStyleEnum
+	'style' style = LayoutStyleEnum
 ;
 
 LayoutStyleEnum:
 	'automatic' | 'circular' | 'tree' | 'hierarchical' | 'symmetric' | 'general'
 ;
 
 AestheticCriteria:
-	howToLayout = 'criteria' aestheticCriteria += AestheticCriteion[',']
+	'criteria' aestheticCriteria += AestheticCriteion[',']
 ;
 
 LayoutAlgorithm:
-	howToLayout = 'algorithm' algorithm = LayoutAlgorithmEnum
+	'algorithm' algorithm = LayoutAlgorithmEnum
 ;
 
 AestheticCriteion:

diff --git a/GraphLayoutDSL/target/classes/interpreter/Interpreter.py b/GraphLayoutDSL/target/classes/interpreter/Interpreter.py
@@ -60,9 +60,15 @@ def execute(self, model_str):
 
     @staticmethod
     def execute_one(layout, graph):
-            layoutType = layout.howToLayout
+
+            if layout.__class__.__name__ == "LayoutStyle":
+                layoutType = "style"
+            elif layout.__class__.__name__ == "LayoutAlgorithm":
+                layoutType = "algorithm"
+            else:
+                layoutType = "criteria"
 
-            if layoutType== 'algorithm':
+            if layoutType == 'algorithm':
                 #a map that will contain all information about the algorithm
                 algorithmProperties = {}
                 algorithm = layout.algorithm

diff --git a/GraphLayoutDSL/target/classes/language/layout.tx b/GraphLayoutDSL/target/classes/language/layout.tx
@@ -24,19 +24,19 @@ LayoutEnum:
 ;
 
 LayoutStyle:
-	howToLayout = 'style' style = LayoutStyleEnum
+	'style' style = LayoutStyleEnum
 ;
 
 LayoutStyleEnum:
 	'automatic' | 'circular' | 'tree' | 'hierarchical' | 'symmetric' | 'general'
 ;
 
 AestheticCriteria:
-	howToLayout = 'criteria' aestheticCriteria += AestheticCriteion[',']
+	'criteria' aestheticCriteria += AestheticCriteion[',']
 ;
 
 LayoutAlgorithm:
-	howToLayout = 'algorithm' algorithm = LayoutAlgorithmEnum
+	'algorithm' algorithm = LayoutAlgorithmEnum
 ;
 
 AestheticCriteion: