Merge branch 'master' of https://github.com/XinLiu92/programmingAssig…

…nment2Group7
xliu78 · Sep 17, 2018 · 9fcdfcc · 9fcdfcc
2 parents 8fb647e + 2a84d59
commit 9fcdfcc
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 13 deletions.
diff --git a/src/main/Main.java b/src/main/Main.java
@@ -21,6 +21,10 @@ public class Main {
     private  static String methdName = "";
     private  static  String indexPath = "";
     private  static  boolean useDefaultScore = true;
+    private  static  String paragraphPath = "";
+    private  static  String pagePath = "";
+    private  static  String qrelPath = "";
+
     public static void main(String[] args) throws IOException, ParseException, CborException {
         System.setProperty("file.encoding", "UTF-8");
 //        String methdName = "";
@@ -30,6 +34,12 @@ public static void main(String[] args) throws IOException, ParseException, CborE
         ///Users/xinliu/Documents/UNH/18Fall/cs853/index /Users/xinliu/Documents/UNH/18Fall/cs853/test200/test200-train/train.pages.cbor-paragraphs.cbor
         String defualtScore = args[0];
         indexPath = args[1];
+        paragraphPath = args[2];
+        pagePath = args[3];
+        qrelPath = args[4];
+
+
+
         useDefaultScore = Boolean.valueOf(defualtScore);
         if (useDefaultScore){
             methdName = "default";
@@ -40,10 +50,11 @@ public static void main(String[] args) throws IOException, ParseException, CborE
         }
 
 
+        ReadData readData = new ReadData(paragraphPath,pagePath,qrelPath);
+        List<Paragraph> paragraphsList = readData.getParagraphList();
+//        List<Paragraph> paragraphsList = ReadData.getParagraphList();
 
-        List<Paragraph> paragraphsList = ReadData.getParagraphList();
-
-        List<Page> pageList = ReadData.getPageList();
+        List<Page> pageList = readData.getPageList();
 
         List<Rank> rankList = getRankList(paragraphsList,pageList,useDefaultScore,methdName,indexPath);
 

diff --git a/src/main/ReadData.java b/src/main/ReadData.java
@@ -10,25 +10,41 @@
 
 public class ReadData {
 
+    private static String paragPath = "";
+    private static String pagePath = "";
+    private static String qrelPath = "";
+
+
+    public ReadData(){
+
+    }
+
+    public ReadData(String paragraphPath,String pagedir, String qreldir){
+        this.paragPath = paragraphPath;
+        this.pagePath = pagedir;
+        this.qrelPath = qreldir;
+    }
+
+
     public static void main(String args[]){
 //        if (args.length < 1){
 //            System.out.println("command line argument : FileDirectory");
 //        }
 
 //        String filePath = args[0];
 
-
-        System.out.println("reading data");
-
-
+        paragPath = args[0];
+        pagePath = args[1];
+        qrelPath = args[2];
 
     }
 
 
     public static List<Paragraph> getParagraphList() {
         List<Paragraph> paragraphsList = new ArrayList<>();
-        String fileDir = "./test200-train/train.pages.cbor-paragraphs.cbor";
-        File file = new File(fileDir);
+//        String fileDir = "./test200-train/train.pages.cbor-paragraphs.cbor";
+        System.out.println(pagePath);
+        File file = new File(paragPath);
 
         FileInputStream stream = null;
         try {
@@ -59,9 +75,9 @@ public static List<Paragraph> getParagraphList() {
     public static List<Page> getPageList(){
         List<Page> pageList = new ArrayList<>();
 
-        String fileDir = "./test200-train/train.pages.cbor-outlines.cbor";
+//        String fileDir = "./test200-train/train.pages.cbor-outlines.cbor";
 
-        File file = new File(fileDir);
+        File file = new File(pagePath);
 
         FileInputStream stream = null;
         try {
@@ -91,10 +107,10 @@ public static List<Page> getPageList(){
     public static TreeMap<String, List<String>> getRelevant(){
         TreeMap<String,List<String>> res = new TreeMap<>();
 
-        String path = "./test200-train/train.pages.cbor-article.qrels";
+//        String path = "./test200-train/train.pages.cbor-article.qrels";
         BufferedReader bufferedReader = null;
 
-        File file = new File(path);
+        File file = new File(qrelPath);
         FileInputStream stream = null;
         try {
             stream = new FileInputStream(file);

diff --git a/target/classes/main/Main.class b/target/classes/main/Main.class