16 files changed, 44 insertions, 45 deletions
diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py
index a70b23b..770e5d5 100755
--- a/bin/analyze-archive.py
+++ b/bin/analyze-archive.py
@@ -79,14 +79,14 @@ Options:
 
 import getopt
 import json
-import plotter
 import re
 import sys
-from dfatool import PTAModel, RawData, pta_trace_to_aggregate
-from dfatool import gplearn_to_function
-from dfatool import CrossValidator
-from utils import filter_aggregate_by_param
-from automata import PTA
+from dfatool import plotter
+from dfatool.dfatool import PTAModel, RawData, pta_trace_to_aggregate
+from dfatool.dfatool import gplearn_to_function
+from dfatool.dfatool import CrossValidator
+from dfatool.utils import filter_aggregate_by_param
+from dfatool.automata import PTA
 
 opts = {}
 
diff --git a/bin/analyze-timing.py b/bin/analyze-timing.py
index 9a3aa41..6a458d9 100755
--- a/bin/analyze-timing.py
+++ b/bin/analyze-timing.py
@@ -75,14 +75,14 @@ Options:
 
 import getopt
 import json
-import plotter
 import re
 import sys
-from dfatool import AnalyticModel, TimingData, pta_trace_to_aggregate
-from dfatool import gplearn_to_function
-from dfatool import CrossValidator
-from utils import filter_aggregate_by_param
-from parameters import prune_dependent_parameters
+from dfatool import plotter
+from dfatool.dfatool import AnalyticModel, TimingData, pta_trace_to_aggregate
+from dfatool.dfatool import gplearn_to_function
+from dfatool.dfatool import CrossValidator
+from dfatool.utils import filter_aggregate_by_param
+from dfatool.parameters import prune_dependent_parameters
 
 opts = {}
 
diff --git a/bin/cal-hist b/bin/cal-hist
index f615c57..ba2ff47 100755
--- a/bin/cal-hist
+++ b/bin/cal-hist
@@ -7,8 +7,8 @@ import struct
 import sys
 import tarfile
 import matplotlib.pyplot as plt
-from dfatool import MIMOSA
-from utils import running_mean
+from dfatool.dfatool import MIMOSA
+from dfatool.utils import running_mean
 
 voltage = float(sys.argv[1])
 shunt = float(sys.argv[2])
diff --git a/bin/eval-accounting-overhead.py b/bin/eval-accounting-overhead.py
index 9f1e98c..d4b1d2c 100755
--- a/bin/eval-accounting-overhead.py
+++ b/bin/eval-accounting-overhead.py
@@ -13,7 +13,7 @@ providing overhead per transition and getEnergy overhead
 
 """
 
-from dfatool import AnalyticModel, TimingData, pta_trace_to_aggregate
+from dfatool.dfatool import AnalyticModel, TimingData, pta_trace_to_aggregate
 import json
 import sys
 
diff --git a/bin/eval-online-model-accuracy.py b/bin/eval-online-model-accuracy.py
index b4c137e..21e7a1e 100755
--- a/bin/eval-online-model-accuracy.py
+++ b/bin/eval-online-model-accuracy.py
@@ -26,9 +26,9 @@ import re
 import sys
 import itertools
 import yaml
-from automata import PTA
-from codegen import get_simulated_accountingmethod
-from dfatool import regression_measures
+from dfatool.automata import PTA
+from dfatool.codegen import get_simulated_accountingmethod
+from dfatool.dfatool import regression_measures
 import numpy as np
 
 opt = dict()
diff --git a/bin/eval-outlier-removal.py b/bin/eval-outlier-removal.py
index 2bf8072..3a4aa28 100755
--- a/bin/eval-outlier-removal.py
+++ b/bin/eval-outlier-removal.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 
 import getopt
-import plotter
 import re
 import sys
-from dfatool import PTAModel, RawData, soft_cast_int, pta_trace_to_aggregate
+from dfatool.dfatool import PTAModel, RawData, pta_trace_to_aggregate
 
 opts = {}
 
diff --git a/bin/eval-rel-energy.py b/bin/eval-rel-energy.py
index 4803c51..6ae35e0 100755
--- a/bin/eval-rel-energy.py
+++ b/bin/eval-rel-energy.py
@@ -3,7 +3,7 @@
 import getopt
 import re
 import sys
-from dfatool import PTAModel, RawData, pta_trace_to_aggregate
+from dfatool.dfatool import PTAModel, RawData, pta_trace_to_aggregate
 
 opts = {}
 
diff --git a/bin/generate-dfa-benchmark.py b/bin/generate-dfa-benchmark.py
index 1fa1a54..e2de955 100755
--- a/bin/generate-dfa-benchmark.py
+++ b/bin/generate-dfa-benchmark.py
@@ -61,17 +61,17 @@ import getopt
 import json
 import os
 import re
-import runner
 import sys
 import tarfile
 import time
 import io
 import yaml
-from aspectc import Repo
-from automata import PTA
-from codegen import get_accountingmethod, MultipassDriver
-from harness import OnboardTimerHarness, TransitionHarness
-from utils import flatten
+from dfatool import runner
+from dfatool.aspectc import Repo
+from dfatool.automata import PTA
+from dfatool.codegen import get_accountingmethod, MultipassDriver
+from dfatool.harness import OnboardTimerHarness, TransitionHarness
+from dfatool.utils import flatten
 
 opt = dict()
 
diff --git a/bin/generate-dummy-class.py b/bin/generate-dummy-class.py
index 2200486..15cc147 100755
--- a/bin/generate-dummy-class.py
+++ b/bin/generate-dummy-class.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
-from aspectc import Repo
-from codegen import MultipassDriver
-from automata import PTA
+from dfatool.aspectc import Repo
+from dfatool.codegen import MultipassDriver
+from dfatool.automata import PTA
 import yaml
 
 with open('/home/derf/var/projects/multipass/model/driver/nrf24l01.dfa', 'r') as f:
diff --git a/bin/gptest.py b/bin/gptest.py
index dd29a2a..869328e 100755
--- a/bin/gptest.py
+++ b/bin/gptest.py
@@ -2,7 +2,7 @@
 
 import sys
 import numpy as np
-from dfatool import PTAModel, RawData, regression_measures, pta_trace_to_aggregate
+from dfatool.dfatool import PTAModel, RawData, regression_measures, pta_trace_to_aggregate
 from gplearn.genetic import SymbolicRegressor
 from multiprocessing import Pool
 
diff --git a/bin/gradient b/bin/gradient
index eb79b25..8280794 100755
--- a/bin/gradient
+++ b/bin/gradient
@@ -7,8 +7,8 @@ import struct
 import sys
 import tarfile
 import matplotlib.pyplot as plt
-from dfatool import MIMOSA
-from utils import running_mean
+from dfatool.dfatool import MIMOSA
+from dfatool.utils import running_mean
 
 voltage = float(sys.argv[1])
 shunt = float(sys.argv[2])
diff --git a/bin/mim-vs-keysight.py b/bin/mim-vs-keysight.py
index df37d8b..d1ff4e6 100755
--- a/bin/mim-vs-keysight.py
+++ b/bin/mim-vs-keysight.py
@@ -3,8 +3,8 @@
 import numpy as np
 import sys
 import matplotlib.pyplot as plt
-from dfatool import MIMOSA, KeysightCSV
-from utils import running_mean
+from dfatool.dfatool import MIMOSA, KeysightCSV
+from dfatool.utils import running_mean
 
 voltage = float(sys.argv[1])
 shunt = float(sys.argv[2])
diff --git a/bin/mimosa-etv b/bin/mimosa-etv
index 417f1cf..e23b46c 100755
--- a/bin/mimosa-etv
+++ b/bin/mimosa-etv
@@ -8,8 +8,8 @@ import numpy as np
 import os
 import re
 import sys
-from dfatool import aggregate_measures, MIMOSA
-from utils import running_mean
+from dfatool.dfatool import aggregate_measures, MIMOSA
+from dfatool.utils import running_mean
 
 opt = dict()
 
diff --git a/bin/mimplot b/bin/mimplot
index cd71a4f..2a888ee 100755
--- a/bin/mimplot
+++ b/bin/mimplot
@@ -9,8 +9,8 @@ import struct
 import sys
 import tarfile
 import matplotlib.pyplot as plt
-from dfatool import MIMOSA
-from utils import running_mean
+from dfatool.dfatool import MIMOSA
+from dfatool.utils import running_mean
 
 opt = dict()
 
diff --git a/bin/test_corrcoef.py b/bin/test_corrcoef.py
index 593eb51..835e086 100755
--- a/bin/test_corrcoef.py
+++ b/bin/test_corrcoef.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
 import getopt
-import plotter
 import re
 import sys
-from dfatool import PTAModel, RawData, pta_trace_to_aggregate
-from dfatool import soft_cast_int, is_numeric, gplearn_to_function
+from dfatool import plotter
+from dfatool.dfatool import PTAModel, RawData, pta_trace_to_aggregate
+from dfatool.dfatool import gplearn_to_function
 
 opts = {}
 
diff --git a/bin/workload.py b/bin/workload.py
index c78e9a8..6199394 100755
--- a/bin/workload.py
+++ b/bin/workload.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
-from automata import PTA
 import sys
-from utils import human_readable
-from lex import TimedSequence, TimedWord, Workload
+from dfatool.automata import PTA
+from dfatool.utils import human_readable
+from dfatool.lex import TimedSequence, TimedWord, Workload
 
 args = sys.argv[1:]