New methods implementations added to Node

LENOVO-PC\Vasilis · LENOVO-PC\Vasilis · commit 14123611dc13 · 2018-12-07T15:33:22.000+01:00
diff --git a/Assignment3/src/assignment3/message/Message.java b/Assignment3/src/assignment3/message/Message.java
@@ -91,6 +91,14 @@ public void setfName(double fName) {
 		this.fName = fName;
 	}
 	
+	public double getWeight() {
+		return bestWeight;
+	}
+	
+	public void setWeight(double weight) {
+		this.bestWeight = weight;
+	}
+	
 	public NodeState getSenderState() {
 		return senderState;
 	}
diff --git a/Assignment3/src/assignment3/node/Node.java b/Assignment3/src/assignment3/node/Node.java
@@ -138,7 +138,7 @@ private void receiveReject(Message message, Link link) {
 
     }
 
-    private void receiveAccept(Message message, Link link) {
+    private void receiveAccept(Message message, Link link) throws RemoteException {
     	testEdge = null;
     	if (link.getWeight() < weightBestAdjacent){
     		bestEdge = link;
@@ -147,22 +147,55 @@ private void receiveAccept(Message message, Link link) {
     	report();
     }
 
-    private void report() {
+    private void report() throws RemoteException {
     	if (findCount==0 && testEdge.equals(null)){
     		this.state = NodeState.FOUND;
     		Message msg = new Message(MessageType.REPORT, weightBestAdjacent);
+    		nodes[inBranch.getReceiver(id)].receive(msg, inBranch);
     	}
     }
 
-    private void receiveReport(Message message, Link link) {
-
+    private void receiveReport(Message message, Link link) throws RemoteException {
+    	if (!link.equals(inBranch)){
+    		findCount -=1;
+    		if (message.getWeight() < weightBestAdjacent){
+    			weightBestAdjacent = message.getWeight();
+    			bestEdge = link;
+        	}
+    		report();
+    	}
+    	else{
+    		if (this.state == NodeState.FIND){
+    			// TODO: append message to the message queue
+    		}
+    		else{
+    			if (message.getWeight() > weightBestAdjacent)
+    				changeRoot();
+    			else{
+    				if (message.getWeight() == weightBestAdjacent && 
+    						weightBestAdjacent == Double.POSITIVE_INFINITY){
+    					// TODO: HALT
+    				}
+    			}
+    		}
+    	}
     }
 
     private void changeRoot() {
-
+    	if (bestEdge.getState() == LinkState.IN_MST){
+    		Message msg = new Message(MessageType.CHANGE_ROOT);
+    		// TODO: check if bestEdge is adjacent to the node
+    		nodes[bestEdge.getReceiver(id)].receiveChangeRoot(msg, bestEdge);
+    	}
+    	else{
+    		Message msg = new Message(MessageType.CONNECT, level);
+    		// TODO: check if bestEdge is adjacent to the node
+    		nodes[bestEdge.getReceiver(id)].receiveChangeRoot(msg, bestEdge);
+    		bestEdge.setState(LinkState.IN_MST);
+    	}
     }
 
     private void receiveChangeRoot(Message message, Link link) {
-
+    	changeRoot();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,14 @@ public void setfName(double fName) {`
`91`	`91`	`this.fName = fName;`
`92`	`92`	`}`
`93`	`93`
	`94`	`+ public double getWeight() {`
	`95`	`+ return bestWeight;`
	`96`	`+ }`
	`97`	`+`
	`98`	`+ public void setWeight(double weight) {`
	`99`	`+ this.bestWeight = weight;`
	`100`	`+ }`
	`101`	`+`
`94`	`102`	`public NodeState getSenderState() {`
`95`	`103`	`return senderState;`
`96`	`104`	`}`