fix hang in rich edit, and updated readme

python/abstractPatch.py

@@ -295,7 +295,7 @@ def dumpFilesCore(t):
     except Exception as ex:
         logging.error(t)
         logging.error(ex)
-        raise ex
+        # raise ex
 
 
 

python/data/datasets.csv

@@ -8,7 +8,6 @@ gzip, https://git.savannah.gnu.org/git/gzip.git
 libarchive, https://github.com/libarchive/libarchive
 cairo, https://gitlab.freedesktop.org/cairo/cairo.git
 vlc, https://github.com/videolan/vlc.git
-freebsd, https://github.com/freebsd/freebsd
 curl, https://github.com/curl/curl.git
 tcl, https://github.com/tcltk/tcl.git
 cpython, https://github.com/python/cpython.git

python/fixminer.sh

@@ -3,4 +3,4 @@
 
 source activate fixminerEnv
 
-PYTHONPATH=$(pwd) python -u main.py -root $(pwd) -job $1 -prop $2
+PYTHONPATH=$(pwd) python -u main.py -root $(pwd) -job $2 -prop $1

python/main.py

@@ -140,26 +140,26 @@ if __name__ == '__main__':
 
 
         elif job =='indexClusters':
-            # from sprinferIndex import runSpinfer
-            # runSpinfer()
+            from sprinferIndex import runSpinfer
+            runSpinfer()
+
+            from sprinferIndex import test
+            test()
+            from sprinferIndex import divideCoccis
+            divideCoccis()
+            from sprinferIndex import removeDuplicates
+            removeDuplicates()
+
+
+            # from patchManyBugs import patchCore
+            # patchCore()
+            # # from patchManyBugs import patched
+            # # patched()
+            # from patchManyBugs import exportSosPatches
+            # exportSosPatches()
+            # from validate_manybugs import validate
             #
-            # from sprinferIndex import test
-            # test()
-            # from sprinferIndex import divideCoccis
-            # divideCoccis()
-            # from sprinferIndex import removeDuplicates
-            # removeDuplicates()
-
-
-            from patchManyBugs import patchCore
-            patchCore()
-            # from patchManyBugs import patched
-            # patched()
-            from patchManyBugs import exportSosPatches
-            exportSosPatches()
-            from validate_manybugs import validate
-
-            validate()
+            # validate()
 
         elif job =='patternOperations':
             from sprinferIndex import patternOperations

python/otherDatasets.py

@@ -204,7 +204,11 @@ def collectBugFixPatches(dsName):
     # commits = commits[commits.files.apply(lambda x: len(x) == 1)]
     # commits['cocci'] = commits.log.apply(lambda x: True if re.search('cocci|coccinelle', x) else False)
     # coccis = commits[commits.cocci].commit.values.tolist()
-    fixes = commits[commits.fixes.str.len()!=0].commit.values.tolist()
+    if dsName == 'linux':
+        commits['cocci'] = commits.log.apply(lambda x: True if re.search('cocci|coccinelle', x) else False)
+        fixes = commits[commits.cocci].commit.values.tolist()
+    else:
+        fixes = commits[commits.fixes.str.len()!=0].commit.values.tolist()
     # links = commits[commits.links.str.len()!=0].commit.values.tolist()
 
     # bugs = set(fixes).union(links).union(coccis)

python/sprinferIndex.py

@@ -201,7 +201,9 @@ def removeDuplicates():
             ind = ind +1
     cocciPatterns['iFiles'] = cocciPatterns.inferedFrom.apply(lambda x: getInferred(x[0]))
 
-
+    cocciPatterns['freq'] = cocciPatterns.iFiles.apply(lambda x: len(x))
+    cocciPatterns['project'] = cocciPatterns.iFiles.apply(lambda x: list(set([i.split('/{')[0].replace('(','') for i in x])))
+    cocciPatterns.sort_values(by='freq', inplace=True, ascending=False)
     save_zipped_pickle(cocciPatterns,join(DATA_PATH,'allCocciPatterns.pickle'))
     allPatterns = cocciPatterns.cid.values.tolist()
     uniquePatterns = cocciPatterns.drop_duplicates(subset=['pattern']).cid.values.tolist()