New type of messages added and some other methods implemented for node.

LENOVO-PC\Vasilis · LENOVO-PC\Vasilis · commit 091a9f9a47f5 · 2018-12-07T15:10:55.000+01:00
diff --git a/Assignment3/src/assignment3/message/Message.java b/Assignment3/src/assignment3/message/Message.java
@@ -13,22 +13,37 @@ public class Message implements Serializable {
     
 
 	private double fName;
+	private double bestWeight;
     private NodeState senderState;
     
     public Message() {
     }
     
+ // constructor for ACCEPT, REJECT and CHANGE_ROOT messages
+    public Message(MessageType type) {
+    	this.type = type;
+    }
+    
+    // constructor for CONNECT messages
     public Message(MessageType type, int level) {
     	this.type = type;
     	this.level = level;
     }
     
+    // constructor for REPORT messages
+    public Message(MessageType type, double weight) {
+    	this.type = type;
+    	this.bestWeight = weight;
+    }
+    
+    // constructor for TEST messages
     public Message(MessageType type, int level, double name) {
     	this.type = type;
     	this.level = level;
     	fName = name;
     }
     
+    //constructor for INITIATE messages 
     public Message(MessageType type, int level, double name, NodeState s) {
     	this.type = type;
     	this.level = level;
diff --git a/Assignment3/src/assignment3/message/MessageType.java b/Assignment3/src/assignment3/message/MessageType.java
@@ -5,5 +5,6 @@ public enum MessageType {
     TEST,
     ACCEPT,
     CHANGE_ROOT,
-    CONNECT
+    CONNECT, 
+    REPORT
 }
diff --git a/Assignment3/src/assignment3/node/Node.java b/Assignment3/src/assignment3/node/Node.java
@@ -26,7 +26,7 @@ public class Node extends UnicastRemoteObject implements IComponent {
     private Queue<Link> links;
     private Queue<Link> moeCandidatesList;
 
-    private int weightBestAdjecent;
+    private double weightBestAdjacent;
     private Link bestEdge;
     private Link testEdge;
     private Link inBranch;
@@ -66,6 +66,9 @@ public void receive(Message message, Link link) throws RemoteException {
             case INITIATE:
                 receiveInitiate(message, link);
                 break;
+            case REPORT:
+                receiveReport(message, link);
+                break;
             case CHANGE_ROOT:
                 receiveChangeRoot(message, link);
                 break;
@@ -101,7 +104,7 @@ private void receiveInitiate(Message message, Link link) throws RemoteException
         state = message.getSenderState();
         inBranch = link;
         bestEdge = null;//TODO: NIL
-        weightBestAdjecent = -10000; // - INFINITY
+        weightBestAdjacent = -10000; // - INFINITY
 
         for (Link adjescentLink : this.links) {//TODO: Not sure if this is the correct one list of links
             if (adjescentLink != link && adjescentLink.getState() == LinkState.IN_MST) {
@@ -136,11 +139,19 @@ private void receiveReject(Message message, Link link) {
     }
 
     private void receiveAccept(Message message, Link link) {
-
+    	testEdge = null;
+    	if (link.getWeight() < weightBestAdjacent){
+    		bestEdge = link;
+    		weightBestAdjacent = link.getWeight();
+    	}
+    	report();
     }
 
     private void report() {
-
+    	if (findCount==0 && testEdge.equals(null)){
+    		this.state = NodeState.FOUND;
+    		Message msg = new Message(MessageType.REPORT, weightBestAdjacent);
+    	}
     }
 
     private void receiveReport(Message message, Link link) {

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@ public enum MessageType {`
`5`	`5`	`TEST,`
`6`	`6`	`ACCEPT,`
`7`	`7`	`CHANGE_ROOT,`
`8`		`- CONNECT`
	`8`	`+ CONNECT,`
	`9`	`+ REPORT`
`9`	`10`	`}`