From 34f1645c4ec064cd6cd9f9b639120f2ccabe1730 Mon Sep 17 00:00:00 2001
From: Yann Thierry-Mieg <Yann.Thierry-Mieg@lip6.fr>
Date: Sun, 5 May 2024 17:10:37 +0200
Subject: [PATCH] pulled up toPredicates ; TODO : refactor to external helper
 class

---
 .../move/gal/structural/ISparsePetriNet.java  | 80 +++++++++++++++++++
 .../move/gal/structural/SparsePetriNet.java   | 70 +---------------
 2 files changed, 81 insertions(+), 69 deletions(-)

diff --git a/fr.lip6.move.gal.structural/src/fr/lip6/move/gal/structural/ISparsePetriNet.java b/fr.lip6.move.gal.structural/src/fr/lip6/move/gal/structural/ISparsePetriNet.java
index 423a19b3bb..8dc4bfa229 100644
--- a/fr.lip6.move.gal.structural/src/fr/lip6/move/gal/structural/ISparsePetriNet.java
+++ b/fr.lip6.move.gal.structural/src/fr/lip6/move/gal/structural/ISparsePetriNet.java
@@ -1,8 +1,17 @@
 package fr.lip6.move.gal.structural;
 
+import java.util.ArrayList;
 import java.util.BitSet;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.logging.Logger;
 
+import android.util.SparseIntArray;
+import fr.lip6.move.gal.structural.expr.BinOp;
+import fr.lip6.move.gal.structural.expr.Expression;
+import fr.lip6.move.gal.structural.expr.NaryOp;
+import fr.lip6.move.gal.structural.expr.Op;
 import fr.lip6.move.gal.util.IntMatrixCol;
 
 public interface ISparsePetriNet {
@@ -29,4 +38,75 @@ public interface ISparsePetriNet {
 
 	void setSafe(boolean isSafe);
 
+	default void toPredicates(List<Property> properties) {
+		for (Property prop : properties) {
+			prop.setBody(replacePredicates(prop.getBody()));
+		}
+	}
+	
+	default Expression replacePredicates(Expression expr) {
+		if (expr == null) {
+			return expr;
+		} else if (expr instanceof BinOp) {
+			BinOp bin = (BinOp) expr;
+			if (bin.getOp() == Op.DEAD) {
+				return Expression.not(Expression.op(Op.EX, Expression.constant(true), null));
+			}
+			Expression l = replacePredicates(bin.left);
+			Expression r = replacePredicates(bin.right);
+			if (l == bin.left && r == bin.right) {
+				return expr;
+			}
+			return Expression.op(bin.op, l, r);
+		} else if (expr instanceof NaryOp) {
+			NaryOp nop = (NaryOp) expr;
+			List<Expression> resc = new ArrayList<>();
+			if (expr.getOp() == Op.CARD || expr.getOp() == Op.BOUND) {
+				for (Expression child : nop.getChildren()) {
+					if (child.getOp() == Op.PLACEREF) {
+						resc.add(Expression.var(child.getValue()));
+					} else {
+						resc.add(child);
+					}
+				}
+				return Expression.nop(Op.ADD, resc);
+			} else if (expr.getOp() == Op.ENABLED) {
+				Set<SparseIntArray> pres = new HashSet<>();
+				int skipped = 0;
+				for (Expression child : nop.getChildren()) {
+					if (child.getOp() == Op.TRANSREF) {
+						int tid = child.getValue();
+						if (!pres.add(getFlowPT().getColumn(tid))) {
+							skipped++;
+						}
+					}					
+				}
+				if (skipped > 0) {
+					Logger.getLogger("fr.lip6.move.gal").info("Reduced "+skipped+" identical enabling conditions.");
+				}
+				for (SparseIntArray pre : pres) {
+					List<Expression> conds = new ArrayList<>();
+					for (int i=0,ie=pre.size();i<ie;i++) {
+						conds.add(Expression.op(Op.GEQ, Expression.var(pre.keyAt(i)), Expression.constant(pre.valueAt(i))));
+					}
+					resc.add(Expression.nop(Op.AND, conds));
+				}
+				return Expression.nop(Op.OR, resc);				
+			} else {
+				boolean changed = false;
+				for (Expression child : nop.getChildren()) {
+					Expression nc = replacePredicates(child);
+					resc.add(nc);
+					if (nc != child) {
+						changed = true;
+					}
+				}
+				if (!changed) {
+					return expr;
+				}
+				return Expression.nop(nop.getOp(), resc);
+			}
+		} 
+		return expr;
+	}
 }
diff --git a/fr.lip6.move.gal.structural/src/fr/lip6/move/gal/structural/SparsePetriNet.java b/fr.lip6.move.gal.structural/src/fr/lip6/move/gal/structural/SparsePetriNet.java
index ebe4adc9eb..7d71cf66b8 100644
--- a/fr.lip6.move.gal.structural/src/fr/lip6/move/gal/structural/SparsePetriNet.java
+++ b/fr.lip6.move.gal.structural/src/fr/lip6/move/gal/structural/SparsePetriNet.java
@@ -134,75 +134,7 @@ public int getPlaceIndex(String name) {
 	}
 
 	public void toPredicates() {
-		for (Property prop : getProperties()) {
-			prop.setBody(replacePredicates(prop.getBody()));
-		}
-	}
-
-	public Expression replacePredicates(Expression expr) {
-		if (expr == null) {
-			return expr;
-		} else if (expr instanceof BinOp) {
-			BinOp bin = (BinOp) expr;
-			if (bin.getOp() == Op.DEAD) {
-				return Expression.not(Expression.op(Op.EX, Expression.constant(true), null));
-			}
-			Expression l = replacePredicates(bin.left);
-			Expression r = replacePredicates(bin.right);
-			if (l == bin.left && r == bin.right) {
-				return expr;
-			}
-			return Expression.op(bin.op, l, r);
-		} else if (expr instanceof NaryOp) {
-			NaryOp nop = (NaryOp) expr;
-			List<Expression> resc = new ArrayList<>();
-			if (expr.getOp() == Op.CARD || expr.getOp() == Op.BOUND) {
-				for (Expression child : nop.getChildren()) {
-					if (child.getOp() == Op.PLACEREF) {
-						resc.add(Expression.var(child.getValue()));
-					} else {
-						resc.add(child);
-					}
-				}
-				return Expression.nop(Op.ADD, resc);
-			} else if (expr.getOp() == Op.ENABLED) {
-				Set<SparseIntArray> pres = new HashSet<>();
-				int skipped = 0;
-				for (Expression child : nop.getChildren()) {
-					if (child.getOp() == Op.TRANSREF) {
-						int tid = child.getValue();
-						if (!pres.add(flowPT.getColumn(tid))) {
-							skipped++;
-						}
-					}					
-				}
-				if (skipped > 0) {
-					Logger.getLogger("fr.lip6.move.gal").info("Reduced "+skipped+" identical enabling conditions.");
-				}
-				for (SparseIntArray pre : pres) {
-					List<Expression> conds = new ArrayList<>();
-					for (int i=0,ie=pre.size();i<ie;i++) {
-						conds.add(Expression.op(Op.GEQ, Expression.var(pre.keyAt(i)), Expression.constant(pre.valueAt(i))));
-					}
-					resc.add(Expression.nop(Op.AND, conds));
-				}
-				return Expression.nop(Op.OR, resc);				
-			} else {
-				boolean changed = false;
-				for (Expression child : nop.getChildren()) {
-					Expression nc = replacePredicates(child);
-					resc.add(nc);
-					if (nc != child) {
-						changed = true;
-					}
-				}
-				if (!changed) {
-					return expr;
-				}
-				return Expression.nop(nop.getOp(), resc);
-			}
-		} 
-		return expr;
+		toPredicates(getProperties());
 	}
 
 	public int testInInitial () {