P1 pass testcase in which #pathnode is even
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/MapReduceVertex.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/MapReduceVertex.java
index f40795c..c6c1526 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/MapReduceVertex.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/MapReduceVertex.java
@@ -85,11 +85,11 @@
VKmerBytesWritable kmer = new VKmerBytesWritable();
kmerList = new VKmerListWritable();
if(reverseKmer.compareTo(tmpKmer) > 0){
- kmerDir.set(i, KmerDir.FORWARD);
+ kmerDir.add(KmerDir.FORWARD);
kmer.setAsCopy(tmpKmer);
}
else{
- kmerDir.set(i, KmerDir.REVERSE);
+ kmerDir.add(KmerDir.REVERSE);
kmer.setAsCopy(reverseKmer);
}
if(!kmerMapper.containsKey(kmer)){
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P1ForPathMergeVertex.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P1ForPathMergeVertex.java
index 0adf5f6..a6e67c4 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P1ForPathMergeVertex.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P1ForPathMergeVertex.java
@@ -37,6 +37,7 @@
destVertexId = new VKmerBytesWritable();
inFlag = 0;
outFlag = 0;
+ headFlag = getHeadFlag();
headMergeDir = getHeadMergeDir();
if(repeatKmer == null)
repeatKmer = new VKmerBytesWritable();
@@ -185,7 +186,8 @@
// NON-FAKE and Final vertice send msg to FAKE vertex
sendMsgToFakeVertex();
voteToHalt();
- }
+ } else
+ activate();
}
}
} else
diff --git a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/genomix/pregelix/JobRun/PathMergeTestSuite.java b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/genomix/pregelix/JobRun/PathMergeTestSuite.java
index 1362dd7..ace0f79 100644
--- a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/genomix/pregelix/JobRun/PathMergeTestSuite.java
+++ b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/genomix/pregelix/JobRun/PathMergeTestSuite.java
@@ -6,7 +6,7 @@
public static Test suite() throws Exception {
String pattern ="PathMerge";
- String testSet[] = {"3"
+ String testSet[] = {"4"
// "2", "3", "4", "5", "6", "7", "8", "9", "head_6", "head_7",
// "P2_3", "P2_4", "P2_5", "P2_6", "P2_7", "P2_8",
// "LeftAdj", "RightAdj",