change folder name to edu.uci.ics.genomix.pregelix
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3307 123451ca-8445-de46-9d55-352943316053
diff --git a/genomix/genomix-pregelix/data/webmap/part-1-out-500000 b/genomix/genomix-pregelix/data/webmap/part-1-out-500000
index 70b61cf..01fdc9e 100755
--- a/genomix/genomix-pregelix/data/webmap/part-1-out-500000
+++ b/genomix/genomix-pregelix/data/webmap/part-1-out-500000
Binary files differ
diff --git a/genomix/genomix-pregelix/pom.xml b/genomix/genomix-pregelix/pom.xml
index 7544d7c..c429105 100644
--- a/genomix/genomix-pregelix/pom.xml
+++ b/genomix/genomix-pregelix/pom.xml
@@ -64,7 +64,7 @@
<configuration>
<programs>
<program>
- <mainClass>edu.uci.ics.pregelix.example.Client</mainClass>
+ <mainClass>edu.uci.ics.genomix.pregelix.example.Client</mainClass>
<name>pregelix</name>
</program>
</programs>
@@ -128,13 +128,6 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>pregelix-example</artifactId>
- <version>0.2.4-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
<artifactId>genomix-data</artifactId>
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/SequenceFile/GenerateSequenceFile.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/SequenceFile/GenerateSequenceFile.java
index fa2cd56..aedd1c9 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/SequenceFile/GenerateSequenceFile.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/SequenceFile/GenerateSequenceFile.java
@@ -11,9 +11,9 @@
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.SequenceFile.CompressionType;
-import edu.uci.ics.pregelix.GraphVertexOperation;
-import edu.uci.ics.pregelix.bitwise.BitwiseOperation;
+import edu.uci.ics.genomix.pregelix.GraphVertexOperation;
import edu.uci.ics.genomix.type.KmerCountValue;
+import edu.uci.ics.pregelix.bitwise.BitwiseOperation;
public class GenerateSequenceFile {
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/SequenceFile/generateSmallFile.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/SequenceFile/generateSmallFile.java
index 0d1416e..ae4c2f5 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/SequenceFile/generateSmallFile.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/SequenceFile/generateSmallFile.java
@@ -28,7 +28,7 @@
int i = 0;
for(i = 0; i < numOfLines; i++){
- System.out.println(i);
+ //System.out.println(i);
reader.next(outKey, outValue);
writer.append(outKey, outValue);
}
@@ -44,8 +44,8 @@
// TODO Auto-generated method stub
Path dir = new Path("data/webmap");
Path inFile = new Path(dir, "part-1");
- Path outFile = new Path(dir, "part-1-out-1000000");
- generateNumOfLinesFromBigFile(inFile,outFile,1000000);
+ Path outFile = new Path(dir, "part-1-out-20000000");
+ generateNumOfLinesFromBigFile(inFile,outFile,20000000);
}
}
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/client/Client.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/client/Client.java
index beea890..9cf2e3f 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/client/Client.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/client/Client.java
@@ -1,17 +1,3 @@
-/*
- * Copyright 2009-2010 by The Regents of the University of California
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * you may obtain a copy of the License from
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package edu.uci.ics.pregelix.example.client;
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/io/LogAlgorithmMessageWritable.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/io/LogAlgorithmMessageWritable.java
index 262ce7f..9b53fe6 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/io/LogAlgorithmMessageWritable.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/io/LogAlgorithmMessageWritable.java
@@ -7,7 +7,7 @@
import org.apache.hadoop.io.WritableComparable;
-import edu.uci.ics.pregelix.GraphVertexOperation;
+import edu.uci.ics.genomix.pregelix.GraphVertexOperation;
public class LogAlgorithmMessageWritable implements WritableComparable<LogAlgorithmMessageWritable>{
/**
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/io/MessageWritable.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/io/MessageWritable.java
index 151caae..ba3053b 100644
--- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/io/MessageWritable.java
+++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/pregelix/example/io/MessageWritable.java
@@ -7,7 +7,7 @@
import org.apache.hadoop.io.WritableComparable;
-import edu.uci.ics.pregelix.GraphVertexOperation;
+import edu.uci.ics.genomix.pregelix.GraphVertexOperation;
import edu.uci.ics.pregelix.api.graph.Vertex;
public class MessageWritable implements WritableComparable<MessageWritable>{
diff --git a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobGen/JobGenerator.java b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobGen/JobGenerator.java
index c2f52bf..62624a8 100644
--- a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobGen/JobGenerator.java
+++ b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobGen/JobGenerator.java
@@ -10,17 +10,17 @@
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
-import edu.uci.ics.pregelix.BinaryLoadGraphInputFormat;
-import edu.uci.ics.pregelix.BinaryLoadGraphOutputFormat;
-import edu.uci.ics.pregelix.LoadGraphVertex;
-import edu.uci.ics.pregelix.LogAlgorithmForMergeGraphInputFormat;
-import edu.uci.ics.pregelix.LogAlgorithmForMergeGraphOutputFormat;
-import edu.uci.ics.pregelix.LogAlgorithmForMergeGraphVertex;
-import edu.uci.ics.pregelix.MergeGraphVertex;
-import edu.uci.ics.pregelix.LoadGraphVertex.SimpleLoadGraphVertexOutputFormat;
-import edu.uci.ics.pregelix.TestLoadGraphVertex;
-import edu.uci.ics.pregelix.TextLoadGraphInputFormat;
-import edu.uci.ics.pregelix.testDeleteVertexId;
+import edu.uci.ics.genomix.pregelix.BinaryLoadGraphInputFormat;
+import edu.uci.ics.genomix.pregelix.BinaryLoadGraphOutputFormat;
+import edu.uci.ics.genomix.pregelix.LoadGraphVertex;
+import edu.uci.ics.genomix.pregelix.LogAlgorithmForMergeGraphInputFormat;
+import edu.uci.ics.genomix.pregelix.LogAlgorithmForMergeGraphOutputFormat;
+import edu.uci.ics.genomix.pregelix.LogAlgorithmForMergeGraphVertex;
+import edu.uci.ics.genomix.pregelix.MergeGraphVertex;
+import edu.uci.ics.genomix.pregelix.TestLoadGraphVertex;
+import edu.uci.ics.genomix.pregelix.TextLoadGraphInputFormat;
+import edu.uci.ics.genomix.pregelix.testDeleteVertexId;
+import edu.uci.ics.genomix.pregelix.LoadGraphVertex.SimpleLoadGraphVertexOutputFormat;
import edu.uci.ics.pregelix.api.job.PregelixJob;
diff --git a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestSuite.java b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestSuite.java
index 7de6be6..251e223 100644
--- a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestSuite.java
+++ b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestSuite.java
@@ -41,7 +41,7 @@
private static final String PATH_TO_ONLY = "src/test/resources/only.txt";
private static final String FILE_EXTENSION_OF_RESULTS = "result";
- private static final String DATA_PATH = "data/webmap/part-1-out-500000";//sequenceFileMergeTest
+ private static final String DATA_PATH = "data/input/part-1-out-50000";//sequenceFileMergeTest
private static final String HDFS_PATH = "/webmap/";
private static final String HYRACKS_APP_NAME = "pregelix";
diff --git a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/LoadGraphVertexTest.java b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/LoadGraphVertexTest.java
index e88098d..d75e2c2 100644
--- a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/LoadGraphVertexTest.java
+++ b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/LoadGraphVertexTest.java
@@ -14,7 +14,7 @@
import org.junit.Test;
-import edu.uci.ics.pregelix.LoadGraphVertex.SimpleLoadGraphVertexOutputFormat;
+import edu.uci.ics.genomix.pregelix.LoadGraphVertex.SimpleLoadGraphVertexOutputFormat;
import edu.uci.ics.pregelix.api.job.PregelixJob;
import edu.uci.ics.pregelix.example.client.Client;
diff --git a/genomix/genomix-pregelix/src/test/resources/hadoop/conf/mapred-site.xml b/genomix/genomix-pregelix/src/test/resources/hadoop/conf/mapred-site.xml
index 71450f1..f75b072 100644
--- a/genomix/genomix-pregelix/src/test/resources/hadoop/conf/mapred-site.xml
+++ b/genomix/genomix-pregelix/src/test/resources/hadoop/conf/mapred-site.xml
@@ -19,7 +19,7 @@
</property>
<property>
<name>mapred.max.split.size</name>
- <value>128</value>
+ <value>128000</value>
</property>
</configuration>