change

.idea/encodings.xml

@@ -5,9 +5,17 @@
     <file url="file://$PROJECT_DIR$/gumtree" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/client" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/client.diff" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/client.diff/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/client.diff/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/client/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/core" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/gen.jdt" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/gen.srcml" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/richedit" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/richedit/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

README.md

@@ -71,6 +71,10 @@ In order to launch FixMiner, execute [fixminer.sh](python/fixminer.sh)
 
 * Update [config file](src/main/resources/config.yml) with corresponding user paths.
 
+* Install the project with maven from root. (usage [pom.xml](pom.xml))
+  ```powershell
+  mvn clean install
+  ```
 * Active the conda environment from shell
   ```powershell
   source activate fixminerEnv
@@ -81,6 +85,9 @@ In order to launch FixMiner, execute [fixminer.sh](python/fixminer.sh)
     bash fixminer.sh [JOB] [CONFIG_FILE]
      e.g. bash fixminer.sh  dataset4c /Users/projects/release/fixminer_source/src/main/resources/config.yml
 
+#### Redis Commands
+hlen diffEntry
+To see number of patches / diff entries computed rich edit
     
 #### Job Types  
 

fixminer.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+
+source activate fixminerEnv
+
+PYTHONPATH=$(pwd) python -u python/main.py -root $(pwd)/python -job $2 -prop $1

python/javaDS.py

@@ -17,6 +17,8 @@ def createDS():
     pjList = PROJECT_LIST.split(',')
     if not os.path.exists(DATASET_PATH):
         os.mkdir(DATASET_PATH)
+    if not os.path.exists(COMMIT_DFS):
+        os.mkdir(COMMIT_DFS)
 
     subjects = pd.read_csv(join(ROOT,'data', 'dataset.csv'))
 

richedit/src/main/java/edu/lu/uni/serval/Launcher.java

@@ -135,7 +135,8 @@ public class Launcher {
 
             }
         } catch (Exception e) {
-            log.error(e.getMessage());
+//            log.error(e.getMessage());
+            e.printStackTrace();
 //            e.printStackTrace();
 
         }

richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java

@@ -58,8 +58,7 @@ public class EnhancedASTDiff {
 					.filter(x -> !x.getName().startsWith("cocci"))
 					.filter(x -> !x.getName().endsWith(".index"))
 					.collect(Collectors.toList());
-		}
+		} else {
-		else {
 			List<Predicate<File>> allPredicates = new ArrayList<Predicate<File>>();
 			for (String s : projectList) {
 				Predicate<File> predicate = x -> x.getName().endsWith(s);
@@ -74,10 +73,6 @@ public class EnhancedASTDiff {
 		}
 
 
-
-
-
-
 		String project = folder.getName();
 		List<MessageFile> allMessageFiles = new ArrayList<>();
 		for (File target : folders) {
@@ -104,15 +99,24 @@ public class EnhancedASTDiff {
 			log.info("{} files to process ...", allMessageFiles.size());
 		}
 		boolean finalIsJava = isJava;
-		ProgressBar.wrap(allMessageFiles.stream().
+//		ProgressBar.wrap(allMessageFiles.stream().
-				parallel(),"Task").
+//				parallel(),"Task").
+//				forEach(m ->
+//						{
+//							EDiffHunkParser parser =  new EDiffHunkParser();
+//							parser.parseFixPatterns(m.getPrevFile(),m.getRevFile(), m.getDiffEntryFile(),project,innerPool,srcMLPath,hunkLimit, finalIsJava);
+//						}
+//				);
+//
+//        }
+		allMessageFiles.stream().
+				parallel().
 				forEach(m ->
 						{
 							EDiffHunkParser parser = new EDiffHunkParser();
 							parser.parseFixPatterns(m.getPrevFile(), m.getRevFile(), m.getDiffEntryFile(), project, innerPool, srcMLPath, hunkLimit, finalIsJava);
 						}
 				);
-
 	}
 
 	

src/main/resources/config.yml

@@ -7,12 +7,12 @@ coccinelle:
 
 dataset:
 #    home:   /Users/anilkoyuncu/projects/fixminer/fixminer-core/python/data/gumInputLinux
-    inputPath : /Users/anilkoyuncu/projects/test/fixminer-data/patches
+    inputPath : /Users/anil.koyuncu/projects/release/fixminer-data/patches
-    repo:   /Users/anilkoyuncu/projects/test/fixminer-data/datasets
+    repo:   /Users/anil.koyuncu/projects/release/fixminer-data/datasets
 
 fixminer:
     projectType : java
-    datapath: /Users/anilkoyuncu/projects/test/fixminer-data/
+    datapath: /Users/anil.koyuncu/projects/release/fixminer-data/
 
 
     pjName : patches
@@ -22,7 +22,7 @@ fixminer:
     hunkLimit : 2
     patchSize : 50
 
-    projectList : spring-shell,fuse,metadata,commons-codec,commons-collections,commons-compress,commons-configuration,commons-crypto,commons-csv
+    projectList : fuse
-    inputPath : /Users/anilkoyuncu/projects/test/fixminer-data/patches
+    inputPath : /Users/anil.koyuncu/projects/release/fixminer-data/patches
-    redisPath : /Users/anilkoyuncu/projects/release/test/fixminer_source/python/data/redis
+    redisPath : /Users/anil.koyuncu/projects/release/fixminer_source/python/data/redis
     srcMLPath :  /usr/local/bin/srcml