[M] Isolate variables

.gitignore

@@ -15,3 +15,10 @@ gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeTester.java
 *.pyc
 app.log
 *.rdb
+
+# Gradle temporary files
+.gradle
+gradlew
+gradlew.bat
+gradle
+

python/javaDS.py

@@ -1,27 +1,22 @@
 from common.commons import *
 from commitCollector import *
-DATA_PATH = os.environ["DATA_PATH"]
+from python.settings import *
-COMMIT_DFS = os.environ["COMMIT_DFS"]
-# DATASET_PATH = '/Users/anilkoyuncu/projects/datasets'
-REPO_PATH = os.environ["REPO_PATH"]
-DATASET_PATH = os.environ["REPO_PATH"]
-DATASET = os.environ["dataset"]
-ROOT = os.environ["ROOT_DIR"]
-PROJECT_LIST = os.environ["PROJECT_LIST"]
 
 from otherDatasets import markBugFixingPatches
 
+DATASET_PATH = REPO_PATH
+DATASET = os.environ["dataset"]
+PROJECT_LIST = os.environ["PROJECT_LIST"]
+
 
 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'))
+    subjects = pd.read_csv(join(ROOT_DIR, 'data', 'dataset.csv'))
-
 
     if pjList == ['ALL']:
         tuples = subjects[['Repo', 'GitRepo', 'Branch']].values.tolist()

python/main.py

@@ -1,70 +1,60 @@
 from common.commons import *
-
+from python.settings import *
-
-
-
 
 if __name__ == '__main__':
-
-
     try:
         args = getRun()
         setLogg()
 
-
         setEnv(args)
 
         job = args.job
         # job = "cluster"
-        ROOT_DIR = os.environ["ROOT_DIR"]
-        REPO_PATH = os.environ["REPO_PATH"]
-        CODE_PATH = os.environ["CODE_PATH"]
-        DATA_PATH = os.environ["DATA_PATH"]
-        COMMIT_DFS = os.environ["COMMIT_DFS"]
-        BUG_POINT = os.environ["BUG_POINT"]
-        COMMIT_FOLDER = os.environ["COMMIT_FOLDER"]
-        FEATURE_DIR = os.environ["FEATURE_DIR"]
-        DATASET_DIR = os.environ["DATASET_DIR"]
-        PROJECT_TYPE = os.environ["PROJECT_TYPE"]
-        REDIS_PORT = os.environ["REDIS_PORT"]
-        jdk8 = os.environ["JDK8"]
         pd.options.mode.chained_assignment = None
 
-
         # subject = 'ALL'
         # rootType = 'if'
 
         print(job)
 
-
         if job == 'dataset4j':
             from javaDS import createDS
+
             createDS()
 
         elif job == 'dataset4c':
             from otherDatasets import core
+
             core()
         elif job == 'richedit':
             dbDir = join(DATA_PATH, 'redis')
             stopDB(dbDir, REDIS_PORT)
-            cmd = "JAVA_HOME='" + jdk8 + "' java  -jar " + join(Path(ROOT_DIR).parent, 'target','FixPatternMiner-1.0.0-jar-with-dependencies.jar') + " " + args.prop + " RICHEDITSCRIPT "
+            cmd = "JAVA_HOME='" + jdk8 + "' java  -jar " + join(Path(ROOT_DIR).parent, 'target',
+                                                                'FixPatternMiner-1.0.0-jar-with-dependencies.jar') + " " + args.prop + " RICHEDITSCRIPT "
             output = shellCallTemplate(cmd)
             logging.info(output)
 
 
         elif job == 'actionSI':
             from pairs import actionPairs
+
             matches = actionPairs()
 
             from pairs import createPairs
+
             createPairs(matches)
 
             from pairs import importAction
+
             importAction()
 
         elif job == 'compare':
-             # cmd = "mvn exec:java -f '/data/fixminer_source/' -Dexec.mainClass='edu.lu.uni.serval.richedit.akka.compare.CompareTrees' -Dexec.args='"+ " shape " + join(DATA_PATH,"redis") +" ALLdumps-gumInput.rdb " + "clusterl0-gumInputALL.rdb /data/richedit-core/python/data/richEditScript'"
+            # cmd = "mvn exec:java -f '/data/fixminer_source/'
-            cmd = "JAVA_HOME='" + jdk8 + "' java  -jar " + join(Path(ROOT_DIR).parent, 'target','FixPatternMiner-1.0.0-jar-with-dependencies.jar') + " " + args.prop + " COMPARE "
+            # -Dexec.mainClass='edu.lu.uni.serval.richedit.akka.compare.CompareTrees'
+            # -Dexec.args='"+ " shape " + join(DATA_PATH,"redis") +" ALLdumps-gumInput.rdb " +
+            # "clusterl0-gumInputALL.rdb /data/richedit-core/python/data/richEditScript'"
+            cmd = "JAVA_HOME='" + jdk8 + "' java  -jar " + join(Path(ROOT_DIR).parent, 'target',
+                                                                'FixPatternMiner-1.0.0-jar-with-dependencies.jar') + " " + args.prop + " COMPARE "
             output = shellCallTemplate4jar(cmd)
             logging.info(output)
 
@@ -78,9 +68,11 @@ if __name__ == '__main__':
 
         elif job == 'tokenSI':
             from pairs import tokenPairs
+
             tokenPairs()
 
             from pairs import importTokens
+
             importTokens()
 
         elif job == 'clusterTokens':
@@ -93,20 +85,24 @@ if __name__ == '__main__':
 
         elif job == 'codeflaws':
             from otherDatasets import codeflaws
+
             codeflaws()
 
 
         elif job == 'indexClusters':
             from sprinferIndex import runSpinfer
+
             runSpinfer()
 
             from sprinferIndex import test
+
             test()
             from sprinferIndex import divideCoccis
+
             divideCoccis()
             from sprinferIndex import removeDuplicates
-            removeDuplicates()
 
+            removeDuplicates()
 
             # from patchManyBugs import patchCore
             # patchCore()
@@ -120,9 +116,11 @@ if __name__ == '__main__':
 
         elif job == 'patternOperations':
             from sprinferIndex import patternOperations
+
             patternOperations()
         elif job == 'patchManyBugs':
             from patchManyBugs import buildAll
+
             buildAll()
 
             # from patchManyBugs import patchCore
@@ -136,6 +134,7 @@ if __name__ == '__main__':
 
         elif job == 'patchIntro':
             from sprinferIndex import patchCoreIntro
+
             patchCoreIntro()
             # from sprinferIndex import patched
             # patched()
@@ -144,39 +143,49 @@ if __name__ == '__main__':
             # from patch_validate_introClass2 import patch_validate
             # patch_validate()
             from test_patched_file import patch_validate
+
             patch_validate()
         elif job == 'checkCorrectIntro':
             from test_patched_file import checkCorrect
+
             checkCorrect()
         elif job == 'manybugs':
             from getManybugs import export
+
             export()
 
         elif job == 'validateMany':
             from patch_validate import patch_validate
+
             patch_validate()
 
         elif job == 'introclass':
             from getIntroClass import export
+
             export()
 
         elif job == 'stats':
             from stats import statsNormal
+
             statsNormal(True)
 
 
         elif job == 'datasetDefects4J':
             from defects4JDataset import core
+
             core()
 
         elif job == 'bug':
             from bugstats import bStats
+
             bStats()
         elif job == 'defects4j':
             from stats import defects4jStats
+
             defects4jStats()
         elif job == 'patterns':
             from stats import exportAbstractPatterns
+
             exportAbstractPatterns()
 
 

python/settings.py

@@ -0,0 +1,14 @@
+import os
+
+ROOT_DIR = os.environ["ROOT_DIR"]
+REPO_PATH = os.environ["REPO_PATH"]
+CODE_PATH = os.environ["CODE_PATH"]
+DATA_PATH = os.environ["DATA_PATH"]
+COMMIT_DFS = os.environ["COMMIT_DFS"]
+BUG_POINT = os.environ["BUG_POINT"]
+COMMIT_FOLDER = os.environ["COMMIT_FOLDER"]
+FEATURE_DIR = os.environ["FEATURE_DIR"]
+DATASET_DIR = os.environ["DATASET_DIR"]
+PROJECT_TYPE = os.environ["PROJECT_TYPE"]
+REDIS_PORT = os.environ["REDIS_PORT"]
+jdk8 = os.environ["JDK8"]