Remove some unnecessary flag
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/BasicGraphCleanVertex.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/BasicGraphCleanVertex.java
index e329289..de60f19 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/BasicGraphCleanVertex.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/BasicGraphCleanVertex.java
@@ -58,11 +58,9 @@
protected VKmerBytesWritable repeatKmer = null; //for detect tandemRepeat
protected byte repeatDir; //for detect tandemRepeat
protected VKmerBytesWritable tmpKmer = null;
-// protected byte headFlag;
protected byte outFlag;
protected byte inFlag;
protected byte selfFlag;
-// protected byte headMergeDir;
protected EdgeListWritable incomingEdgeList = null; //SplitRepeat
protected EdgeListWritable outgoingEdgeList = null; //SplitRepeat
@@ -81,13 +79,6 @@
GenomixJobConf.setGlobalStaticConstants(getContext().getConfiguration());
}
-// /**
-// * reset headFlag
-// */
-// public void resetHeadFlag(){
-// headFlag = (byte)(getVertexValue().getState() & State.IS_HEAD);
-// }
-
//TODO make it correct
public byte getHeadFlag(){
// return (byte)(getVertexValue().getState() & State.VERTEX_MASK);
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P4ForPathMergeVertex.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P4ForPathMergeVertex.java
index 5629295..2b9eda9 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P4ForPathMergeVertex.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P4ForPathMergeVertex.java
@@ -65,7 +65,6 @@
outFlag = (byte)0;
inFlag = (byte)0;
// Node may be marked as head b/c it's a real head or a real tail
-// headFlag = getHeadFlag(); // TODO be a boolean?
if(repeatKmer == null)
repeatKmer = new VKmerBytesWritable();
tmpValue.reset();
@@ -127,8 +126,6 @@
else if (getSuperstep() == 2)
initState(msgIterator);
else if (getSuperstep() % 4 == 3){
-// outFlag |= headFlag; // TODO are these necessary?
-// outFlag |= State.NO_MERGE;
setStateAsNoMerge();
// only PATH vertices are present. Find the ID's for my neighbors
@@ -138,8 +135,8 @@
// the headFlag and tailFlag's indicate if the node is at the beginning or end of a simple path.
// We prevent merging towards non-path nodes
- hasNext = setNextInfo(getVertexValue()); // TODO HEAD CAN MERGE // TODO headFlag compare not equals, not == 0
- hasPrev = setPrevInfo(getVertexValue()); // TODO this extra logic should go inside the function
+ hasNext = setNextInfo(getVertexValue()); // TODO HEAD CAN MERGE
+ hasPrev = setPrevInfo(getVertexValue());
if (hasNext || hasPrev) {
if (curHead) {
if (hasNext && !nextHead) {