refactor names of flags for bubbleMerge
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/bubblemerge/ComplexBubbleMergeVertex.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/bubblemerge/ComplexBubbleMergeVertex.java
index 90f3bee..18e33dd 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/bubblemerge/ComplexBubbleMergeVertex.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/bubblemerge/ComplexBubbleMergeVertex.java
@@ -206,7 +206,7 @@
//process unchangedSet -- send message to topVertex to update their coverage
outgoingMsg.reset();
outFlag = 0;
- outFlag |= MessageFlag.UNCHANGE;
+ outFlag |= MessageFlag.REPLACE_NODE;
outgoingMsg.setNode(topNode);
outgoingMsg.setFlag(outFlag);
sendMsg(topMsg.getSourceVertexId(), outgoingMsg);
@@ -340,7 +340,7 @@
switch(msgType){
case MessageFlag.UPDATE:
break;
- case MessageFlag.UNCHANGE:
+ case MessageFlag.REPLACE_NODE:
break;
}
}
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/bubblemerge/SimpleBubbleMergeVertex.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/bubblemerge/SimpleBubbleMergeVertex.java
index bfc43ca..89110c2 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/bubblemerge/SimpleBubbleMergeVertex.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/bubblemerge/SimpleBubbleMergeVertex.java
@@ -6,13 +6,6 @@
import java.util.Iterator;
import java.util.Map;
-import edu.uci.ics.genomix.type.EdgeListWritable;
-import edu.uci.ics.genomix.type.EdgeWritable;
-import edu.uci.ics.genomix.type.NodeWritable;
-import edu.uci.ics.genomix.type.NodeWritable.DIR;
-import edu.uci.ics.genomix.type.NodeWritable.EDGETYPE;
-import edu.uci.ics.genomix.type.NodeWritable.NeighborInfo;
-import edu.uci.ics.genomix.type.VKmerBytesWritable;
import edu.uci.ics.genomix.config.GenomixJobConf;
import edu.uci.ics.genomix.pregelix.client.Client;
import edu.uci.ics.genomix.pregelix.io.VertexValueWritable;
@@ -20,6 +13,12 @@
import edu.uci.ics.genomix.pregelix.operator.BasicGraphCleanVertex;
import edu.uci.ics.genomix.pregelix.operator.aggregator.StatisticsAggregator;
import edu.uci.ics.genomix.pregelix.type.MessageFlag;
+import edu.uci.ics.genomix.type.EdgeListWritable;
+import edu.uci.ics.genomix.type.NodeWritable;
+import edu.uci.ics.genomix.type.NodeWritable.DIR;
+import edu.uci.ics.genomix.type.NodeWritable.EDGETYPE;
+import edu.uci.ics.genomix.type.NodeWritable.NeighborInfo;
+import edu.uci.ics.genomix.type.VKmerBytesWritable;
/**
* Graph clean pattern: Simple Bubble Merge
@@ -144,7 +143,7 @@
// 2. send message to delete vertices -- for deletedSet
outgoingMsg.reset();
outFlag = 0;
- outFlag |= MessageFlag.KILL; //TODO killself make msg type flag to enum
+ outFlag |= MessageFlag.KILL_SELF; //TODO make msg type flag to enum
outgoingMsg.setFlag(outFlag);
sendMsg(curMsg.getSourceVertexId(), outgoingMsg);
it.remove();
@@ -154,8 +153,7 @@
//TODO if only one field needs to set in flag, directly set
outgoingMsg.reset();
outFlag = 0;
- //TODO replace node -- flag name
- outFlag |= MessageFlag.UNCHANGE;
+ outFlag |= MessageFlag.REPLACE_NODE;
outgoingMsg.setNode(topNode);
outgoingMsg.setFlag(outFlag);
sendMsg(topMsg.getSourceVertexId(), outgoingMsg);
@@ -200,12 +198,12 @@
BubbleMergeMessageWritable incomingMsg = msgIterator.next();
short msgType = (short) (incomingMsg.getFlag() & MessageFlag.MSG_TYPE_MASK);
switch(msgType){
- case MessageFlag.UNCHANGE:
+ case MessageFlag.REPLACE_NODE:
// update Node including average coverage
getVertexValue().setNode(incomingMsg.getNode());
activate();
break;
- case MessageFlag.KILL:
+ case MessageFlag.KILL_SELF:
broadcastKillself();
deleteVertex(getVertexId());
break;
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/type/MessageFlag.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/type/MessageFlag.java
index f2dd5da..43bcf8c 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/type/MessageFlag.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/type/MessageFlag.java
@@ -15,9 +15,9 @@
public static final byte[] values = { DIR_FF, DIR_FR, DIR_RF, DIR_RR };
- public static final short UNCHANGE = 0b01 << 7;
+ public static final short REPLACE_NODE = 0b01 << 7;
public static final short UPDATE = 0b010 << 7; //reuse 0b0 << 6, becasue UNCHANGE and UPDATE use for different patterns
- public static final short KILL = 0b011 << 7;
+ public static final short KILL_SELF = 0b011 << 7;
public static final short MSG_TYPE_MASK = 0b11 << 7;
public static final short MSG_TYPE_CLEAR = 0b111111110111111;