Merge lp:~danilovesky/workcraft/trunk-bug-1338529 into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/FunctionContact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/FunctionContact.java	2014-06-27 14:48:42 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/FunctionContact.java	2014-07-07 13:25:20 +0000
@@ -25,15 +25,14 @@
 import org.workcraft.annotations.VisualClass;
 import org.workcraft.observation.PropertyChangedEvent;
 import org.workcraft.plugins.cpog.optimisation.BooleanFormula;
-import org.workcraft.plugins.cpog.optimisation.expressions.Zero;
 
 
 @DisplayName("FunctionContact")
 @VisualClass(org.workcraft.plugins.circuit.VisualFunctionContact.class)
 
 public class FunctionContact extends Contact {
-	private BooleanFormula setFunction=Zero.instance();
-	private BooleanFormula resetFunction=null;
+	private BooleanFormula setFunction = null;
+	private BooleanFormula resetFunction = null;
 	
 	public FunctionContact(IOType ioType) {
 		super(ioType);
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java	2014-06-27 14:48:42 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java	2014-07-07 13:25:20 +0000
@@ -346,12 +346,12 @@
 		return (Contact)getReferencedComponent();
 	}
 
-	public static boolean isDriver(Node contact) {
-		if (!(contact instanceof VisualContact)) {
-			return false;
+	public static boolean isDriver(Node node) {
+		if (node instanceof VisualContact) {
+			VisualContact contact = (VisualContact)node;
+			return (contact.getIOType() == IOType.OUTPUT) || !(contact.getParent() instanceof VisualComponent);
 		}
-		return ( (((VisualContact)contact).getIOType() == IOType.OUTPUT)
-			== (((VisualContact)contact).getParent() instanceof VisualComponent) );
+		return false;
 	}
 
 	public HashSet<SignalTransition> getReferencedTransitions() {
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/tools/STGGenerator.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/tools/STGGenerator.java	2014-06-27 14:48:42 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tools/STGGenerator.java	2014-07-07 13:25:20 +0000
@@ -31,6 +31,7 @@
 import org.workcraft.plugins.circuit.VisualFunctionContact;
 import org.workcraft.plugins.circuit.VisualJoint;
 import org.workcraft.plugins.cpog.optimisation.BooleanFormula;
+import org.workcraft.plugins.cpog.optimisation.BooleanVariable;
 import org.workcraft.plugins.cpog.optimisation.Literal;
 import org.workcraft.plugins.cpog.optimisation.booleanvisitors.FormulaToString;
 import org.workcraft.plugins.cpog.optimisation.dnf.Dnf;
@@ -41,6 +42,7 @@
 import org.workcraft.plugins.stg.STG;
 import org.workcraft.plugins.stg.SignalTransition;
 import org.workcraft.plugins.stg.SignalTransition.Direction;
+import org.workcraft.plugins.stg.SignalTransition.Type;
 import org.workcraft.plugins.stg.VisualSTG;
 import org.workcraft.plugins.stg.VisualSignalTransition;
 import org.workcraft.util.Hierarchy;
@@ -144,71 +146,70 @@
 					// if it is a driver, add it to the list of drivers
 					cstg = generatePlaces(circuit, stg, contact);
 					drivers.put(contact, cstg);
-					
 					// attach driven wires to the place
 					attachConnections(circuit, contact, cstg);
-					
 					// put itself on a target list as well, so that it can be addressed by other drivers
 					targetDrivers.put(contact.getReferencedContact(), contact);
 				} else {
 					// if not a driver, find related driver, add to the map of targets
 					VisualContact driver = findDriver(circuit, contact);
-					
-					if (driver==null) {
+					if (driver == null) {
 						// if target driver was not found, create artificial one that looks like input
-						//driver = new VisualContact(new Contact(IOType.INPUT), VisualContact.flipDirection(contact.getDirection()), contact.getName());
-						//driver.setTransform(contact.getTransform());
-						//driver.setParent(contact.getParent());
 						driver = contact;
 						cstg = generatePlaces(circuit, stg, contact);
-						
 						drivers.put(driver, cstg);
 						// attach driven wires to the place
 						attachConnections(circuit, contact, cstg);
 					}
-
 					targetDrivers.put(contact.getReferencedContact(), driver);
 				}
 			}
-			
+
 			// Generate implementation for each of the drivers
-			for(VisualContact c : drivers.keySet()) {
-				if (c instanceof VisualFunctionContact) {
-					VisualFunctionContact contact = (VisualFunctionContact)c;
-					// Determine I/O type of the contact 
-					SignalTransition.Type ttype = SignalTransition.Type.OUTPUT;
-					boolean comesFromEnvironment = false;
-					if (contact.getParent() instanceof VisualCircuitComponent) {
-						comesFromEnvironment = ((VisualCircuitComponent)contact.getParent()).getIsEnvironment();
-					}
-					if (comesFromEnvironment || (contact.getIOType()==IOType.INPUT)) {
-						ttype = SignalTransition.Type.INPUT; 
-					}
-					// Function based driver
-					BooleanFormula setFunc = contact.getSetFunction();
-					BooleanFormula resetFunc = contact.getResetFunction();
-					if ((setFunc != null) && (resetFunc == null)) {
-						resetFunc = new DumbBooleanWorker().not(setFunc);
-					} else if ((setFunc == null) && (resetFunc != null)) {
-						setFunc = new DumbBooleanWorker().not(resetFunc);
-					}
-					Dnf setDnf = DnfGenerator.generate(setFunc);
-					Dnf resetDnf = DnfGenerator.generate(resetFunc);
-					implementDriver(circuit, stg, contact, drivers, targetDrivers, setDnf, resetDnf, ttype);
-				} else {
-					// Some generic driver implementation otherwise
-					Dnf setDnf = new Dnf(new DnfClause());
-					Dnf resetDnf = new Dnf(new DnfClause());
-					implementDriver(circuit, stg, c, drivers, targetDrivers, setDnf, resetDnf, SignalTransition.Type.INPUT);
-				}
+			for(VisualContact driver : drivers.keySet()) {
+				BooleanFormula setFunc = null;
+				BooleanFormula resetFunc = null;
+				Type signalType = Type.INPUT;
+				if (driver instanceof VisualFunctionContact) {
+					VisualFunctionContact contact = (VisualFunctionContact)driver;
+					if ((contact.getIOType() == IOType.OUTPUT) && !isFromEnvironment(contact)) {
+						signalType = Type.OUTPUT;
+					}
+					if ((contact.getIOType() == IOType.OUTPUT) && !(contact.getParent() instanceof VisualCircuitComponent)) {
+						// Driver of the primary output port
+						VisualContact outputDriver = findDriver(circuit, contact);
+						if (outputDriver != null) {
+							setFunc = outputDriver.getReferencedContact();
+						}
+					} else {
+						// Function based driver
+						setFunc = contact.getSetFunction();
+						resetFunc = contact.getResetFunction();
+					}
+				}
+				// Create complementary set/reset if only one of them is defined
+				if ((setFunc != null) && (resetFunc == null)) {
+					resetFunc = new DumbBooleanWorker().not(setFunc);
+				} else if ((setFunc == null) && (resetFunc != null)) {
+					setFunc = new DumbBooleanWorker().not(resetFunc);
+				}
+				Dnf setDnf = DnfGenerator.generate(setFunc);
+				Dnf resetDnf = DnfGenerator.generate(resetFunc);
+				implementDriver(circuit, stg, driver, drivers, targetDrivers, setDnf, resetDnf, signalType);
 			}
 			return stg;
 		} catch (InvalidConnectionException e) {
 			throw new RuntimeException(e);
 		}
 	}
+
+	private static boolean isFromEnvironment(VisualContact contact) {
+		if (contact.getParent() instanceof VisualCircuitComponent) {
+			return ((VisualCircuitComponent)contact.getParent()).getIsEnvironment();
+		}
+		return false;
+	}
 	
-
 	private static void implementDriver(VisualCircuit circuit, VisualSTG stg,
 			VisualContact contact,
 			Map<VisualContact, ContactSTG> drivers,
@@ -276,13 +277,11 @@
 		contact.getReferencedTransitions().clear();
 		
 		nodes.addAll(buildTransitions(contact, stg, circuit, drivers, targetDrivers, 
-				set, 
-				add(add(center, direction), pOffset), plusDirection, 
+				set, add(add(center, direction), pOffset), plusDirection, 
 				signalName, ttype, SignalTransition.Direction.PLUS, p.p0, p.p1));
 		
 		nodes.addAll(buildTransitions(contact, stg, circuit, drivers, targetDrivers, 
-				reset, 
-				subtract(add(center, direction), pOffset),  minusDirection, 
+				reset, subtract(add(center, direction), pOffset),  minusDirection, 
 				signalName, ttype, SignalTransition.Direction.MINUS, p.p1, p.p0));
 		
 		stg.select(nodes);