Merge remote-tracking branch 'refs/remotes/uobteachingtechnologist/master'

AliShug · AliShug · commit 21e7781f2758 · 2017-02-09T14:49:47.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -67,3 +67,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 /bin/
+/bin1/
diff --git a/src/com/modsim/Main.java b/src/com/modsim/Main.java
@@ -36,6 +36,7 @@ public void run() {
 				ui.showUI(true);
 
 				// Start sim ticking - sim is initialized below *before* this is called
+				sim.newSim();
 				sim.start();
 			}
 		});
diff --git a/src/com/modsim/gui/view/View.java b/src/com/modsim/gui/view/View.java
@@ -130,16 +130,6 @@ public void paintStatic() {
             drawGrid(staticG);
             staticG.setTransform(oldStatic);
 
-            // Draw links
-            staticG.transform(wToV);
-            for (Link l : Main.sim.getLinks()) {
-                if (l == null) {
-                    System.err.println("Warning: Null link encountered while drawing");
-                    continue;
-                }
-                l.draw(staticG);
-            }
-
             // Draw modules - static
             staticG.setTransform(oldStatic);
             for (BaseModule m : Main.sim.getModules()) {
@@ -149,6 +139,16 @@ public void paintStatic() {
                 staticG.setTransform(oldStatic);
             }
 
+            // Draw links
+            staticG.transform(wToV);
+            for (Link l : Main.sim.getLinks()) {
+                if (l == null) {
+                    System.err.println("Warning: Null link encountered while drawing");
+                    continue;
+                }
+                l.draw(staticG);
+            }
+            
             staticG.setTransform(oldStatic);
 
             // Static canvas is now up-to-date
diff --git a/src/com/modsim/modules/Link.java b/src/com/modsim/modules/Link.java
@@ -167,9 +167,7 @@ else if (source.canInput() && target.canOutput()) {
             // Changes are done
             Main.opStack.endCompoundOp();
 
-            // Propagate
             newLink.targ.setVal(newLink.src.getVal());
-            Main.sim.propagate(newLink.targ.owner);
 
             return newLink;
         }
diff --git a/src/com/modsim/modules/SplitMerge.java b/src/com/modsim/modules/SplitMerge.java
@@ -8,8 +8,12 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.swing.JOptionPane;
+
 import com.modsim.modules.ports.BidirPort;
+import com.modsim.Main;
 import com.modsim.modules.parts.Port;
+import com.modsim.modules.parts.SSText;
 import com.modsim.res.Colors;
 import com.modsim.simulator.PickableEntity;
 import com.modsim.util.BezierCurve;
@@ -74,6 +78,14 @@ public SplitMerge() {
         cs[8] = new BezierCurve(new Vec2(B + b1,  23),  new Vec2(d - b0, -23), // B1-d0
                                 new Vec2(B + b1, -15),  new Vec2(d - b0, 15));
         curves = Collections.unmodifiableList(Arrays.asList(cs));
+        
+        parts.add(new SSText(A-10, 24, "DCBA", 7, Colors.labelText));
+        parts.add(new SSText(B-10, 24, "XXDC", 7, Colors.labelText));
+        parts.add(new SSText(a+10, -24, "ABXX", -7, Colors.labelText));
+        parts.add(new SSText(b+10, -24, "BXXX", -7, Colors.labelText));
+        parts.add(new SSText(c+10, -24, "CDXX", -7, Colors.labelText));
+        parts.add(new SSText(d+10, -24, "DXXX", -7, Colors.labelText));
+
     }
 
     @Override
@@ -133,12 +145,22 @@ public void propagate() {
 
         // Switch based on propagation direction
         if (portA0.wasUpdated() || portA1.wasUpdated()) {
+        	if(portA0.isConnected() && portA1.isConnected())
+        	{
+        		JOptionPane.showMessageDialog(Main.ui.pane, "Error: There must only be one connection to that size of split/merge.");
+        		Port port = portA0.wasUpdated()?portA0:portA1;
+        		synchronized (Main.sim)
+				{
+	        		Main.sim.removeLink(port.link);	        		
+        		}
+        		return;
+        	}
             b0_val.setBit(0, a0_val.getBit(0)); // A0-a0
             b1_val.setBit(0, a0_val.getBit(1)); // A1-b1
             b0_val.setBit(1, a0_val.getBit(1)); // A1-a1
 
             // Resolution of 3-state logic for merges
-            b3_val.setBit(0, a0_val.getBit(3));     // A3-d0
+            b3_val.setBit(0, a0_val.getBit(3));   // A3-d0
             b3_val.resolveBit(0, a1_val.getBit(1)); // B1-d0
 
             b2_val.setBit(0, a0_val.getBit(2));     // A2-c0
@@ -151,15 +173,15 @@ else if (   portB0.wasUpdated() || portB1.wasUpdated() ||
                     portB2.wasUpdated() || portB3.wasUpdated()) {
             a0_val.setBit(0, b0_val.getBit(0)); // a0-A0
             a0_val.setBit(2, b2_val.getBit(0)); // c0-A2
-            a0_val.setBit(3, b2_val.getBit(1)); // c1-A3
             a1_val.setBit(0, b2_val.getBit(0)); // c0-B0
 
             // Resolution of 3-state logic for merges
-            a1_val.setBit(1, b2_val.getBit(1));     // c1-B1
-            a1_val.resolveBit(1, b3_val.getBit(0)); // d0-B1
-
-            a0_val.setBit(1, b0_val.getBit(1));     // a1-A1
-            a0_val.resolveBit(1, b1_val.getBit(0)); // b0-A1
+            int val = b2_val.getBit(1) | b3_val.getBit(0);
+            a1_val.setBit(1, val);
+            a0_val.setBit(3, val);
+            
+            val = b0_val.getBit(1) | b1_val.getBit(0);
+            a0_val.setBit(1, val);
         }
 
         // Set the values
diff --git a/src/com/modsim/modules/ports/BidirPort.java b/src/com/modsim/modules/ports/BidirPort.java
@@ -107,4 +107,13 @@ public boolean hasDirection() {
         return !(mode == Mode.MODE_BIDIR);
     }
 
+	public boolean isConnected() {
+		BinData data = this.getVal();
+		for(int i = 0; i<4; i++)
+		{
+			if(data.getBit(i)!=BinData.NOCON) return true;
+		}
+		return false;
+	}
+
 }
diff --git a/src/com/modsim/simulator/Sim.java b/src/com/modsim/simulator/Sim.java
@@ -2,7 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
 
 import javax.swing.JOptionPane;
 
@@ -11,6 +13,8 @@
 import static com.modsim.modules.BaseModule.AvailableModules;
 import com.modsim.modules.parts.Port;
 import sun.awt.Mutex;
+
+import com.modsim.util.BinData;
 import com.modsim.util.CtrlPt;
 
 public class Sim implements Runnable {
@@ -38,6 +42,8 @@ public class Sim implements Runnable {
     private List<BaseModule> deferredPropagators = new ArrayList<>();
     private int deferring = 0;
 
+    private Queue<QueueItem> propagationQueue;
+    
     /**
      * Begin deferring propagation operations (preventing errors during large-scale operations)
      */
@@ -101,7 +107,7 @@ public void newSim() {
             filePath = "";
             Main.ui.updateTitle();
         }
-
+		propagationQueue = new LinkedList<QueueItem>();
         Main.ui.view.flagStaticRedraw();
     }
 
@@ -197,6 +203,8 @@ public void removeLink(Link l) {
         synchronized (this) {
             links.remove(l);
         }
+        l.src.link = null;
+        l.targ.setVal(new BinData());
     }
 
     /**
@@ -324,9 +332,9 @@ private void doPropagate(BaseModule m, boolean[] visited) {
                     p.link.targ.setVal(p.getVal());
 
                     // Add link to visited - remove after propagation
-                    visited[id] = true;
-                    doPropagate(p.link.targ.owner, visited);
-                    visited[id] = false;
+                    boolean[] clone = visited.clone();
+                    clone[id] = true;
+                    propagationQueue.add(new QueueItem(p.link.targ.owner, clone));
                 }
                 p.updated = false;
             }
@@ -339,7 +347,21 @@ private void doPropagate(BaseModule m, boolean[] visited) {
      */
     public void propagate(BaseModule m) {
         synchronized (lock) {
-            doPropagate(m, new boolean[1024]);
+        	propagationQueue.add(new QueueItem(m, new boolean[1024]));
+        	while(!propagationQueue.isEmpty()){
+        		QueueItem it = propagationQueue.remove();
+        		doPropagate(it.baseModule, it.visited);
+        	}
         }
     }
+    
+    class QueueItem {
+    	private BaseModule baseModule;
+    	private boolean[] visited;
+    	public QueueItem(BaseModule m, boolean[] v){
+    		baseModule = m;
+    		visited = v;
+    	}
+    }
+    
 }
diff --git a/src/com/modsim/tools/MakeLinkTool.java b/src/com/modsim/tools/MakeLinkTool.java
@@ -120,7 +120,8 @@ public boolean endLink(int x, int y) {
 			Main.opStack.beginCompoundOp();
 			Link l = Link.createLink(source, targ, curve);
 			if (l != null) {
-				Main.sim.addLink(l);
+	            Main.sim.addLink(l);
+	            Main.sim.propagate(l.targ.owner);
 				Main.opStack.pushOp(new CreateOperation(l));
 			}
 			Main.opStack.endCompoundOp();
diff --git a/src/com/modsim/util/ModuleClipboard.java b/src/com/modsim/util/ModuleClipboard.java
@@ -152,7 +152,7 @@ protected void doCopy(List<BaseModule> src, List<BaseModule> destModules, List<L
                     // Store the new link
                     if (newLink != null) {
                         assert newLink.path != oldPort.link.path;
-
+                        Main.sim.propagate(newLink.targ.owner);
                         newPort.link = newLink;
                         destLinks.add(newLink);
                     }
diff --git a/src/com/modsim/util/XMLReader.java b/src/com/modsim/util/XMLReader.java
@@ -188,6 +188,7 @@ else if (p.ID == targID) {
                     // Add to the simulation
                     if (l != null) {
                         Main.sim.addLink(l);
+                        Main.sim.propagate(l.targ.owner);
                     }
                     else {
                         badLinks++;

-Original file line number
+Diff line change
 # Windows shortcuts
 *.lnk
 /bin/
 +/bin1/
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public void run() {`
`36`	`36`	`ui.showUI(true);`
`37`	`37`
`38`	`38`	`// Start sim ticking - sim is initialized below before this is called`
	`39`	`+ sim.newSim();`
`39`	`40`	`sim.start();`
`40`	`41`	`}`
`41`	`42`	`});`
Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,7 @@ else if (source.canInput() && target.canOutput()) {`
`167`	`167`	`// Changes are done`
`168`	`168`	`Main.opStack.endCompoundOp();`
`169`	`169`
`170`		`- // Propagate`
`171`	`170`	`newLink.targ.setVal(newLink.src.getVal());`
`172`		`- Main.sim.propagate(newLink.targ.owner);`
`173`	`171`
`174`	`172`	`return newLink;`
`175`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,4 +107,13 @@ public boolean hasDirection() {`
`107`	`107`	`return !(mode == Mode.MODE_BIDIR);`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ public boolean isConnected() {`
	`111`	`+ BinData data = this.getVal();`
	`112`	`+ for(int i = 0; i<4; i++)`
	`113`	`+ {`
	`114`	`+ if(data.getBit(i)!=BinData.NOCON) return true;`
	`115`	`+ }`
	`116`	`+ return false;`
	`117`	`+ }`
	`118`	`+`
`110`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ protected void doCopy(List<BaseModule> src, List<BaseModule> destModules, List<L`
`152`	`152`	`// Store the new link`
`153`	`153`	`if (newLink != null) {`
`154`	`154`	`assert newLink.path != oldPort.link.path;`
`155`		`-`
	`155`	`+ Main.sim.propagate(newLink.targ.owner);`
`156`	`156`	`newPort.link = newLink;`
`157`	`157`	`destLinks.add(newLink);`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@ else if (p.ID == targID) {`
`188`	`188`	`// Add to the simulation`
`189`	`189`	`if (l != null) {`
`190`	`190`	`Main.sim.addLink(l);`
	`191`	`+ Main.sim.propagate(l.targ.owner);`
`191`	`192`	`}`
`192`	`193`	`else {`
`193`	`194`	`badLinks++;`