From 9fa9b3300a9758982f58cd528e07483950d9fe68 Mon Sep 17 00:00:00 2001
From: Lip Wang <zqwang1993@gmail.com>
Date: Sat, 16 Jul 2022 23:18:30 -0400
Subject: [PATCH 1/2] fixed module import issues and clean code

---
 tl_algs/burak.py | 11 +----------
 tl_algs/ctl.py   |  6 +-----
 tl_algs/trbag.py |  2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/tl_algs/burak.py b/tl_algs/burak.py
index 88e9292..88434c3 100644
--- a/tl_algs/burak.py
+++ b/tl_algs/burak.py
@@ -27,7 +27,6 @@ def _kmeans_cluster(test_set_X, train_pool_X, train_pool_y, cluster_factor,
         entry is the ith cluster of training and test instances.
     """
 
-    # master_X_df = train_pool_X.append(test_set_X)
     master_X_df = pd.concat([train_pool_X, test_set_X])
     num_clust = master_X_df.shape[0] // cluster_factor
 
@@ -46,8 +45,6 @@ def _kmeans_cluster(test_set_X, train_pool_X, train_pool_y, cluster_factor,
     for i, clust in enumerate(X_test_clusters):
         x_pool = pd.DataFrame(test_set_X.iloc[i, ]).transpose()
         clusters[clust]['X_test'] = pd.concat([clusters[clust]['X_test'], x_pool])
-        # clusters[clust]['X_test'] = clusters[clust]['X_test']. \
-        #     append(test_set_X.iloc[i, ])
 
     # Populate clusters based on training data.
     X_train_clusters = cluster_model.predict(train_pool_X)
@@ -56,10 +53,7 @@ def _kmeans_cluster(test_set_X, train_pool_X, train_pool_y, cluster_factor,
         y_pool = pd.Series([train_pool_y.iloc[i]])
         clusters[clust]['X_train'] = pd.concat([clusters[clust]['X_train'], x_pool])
         clusters[clust]['y_train'] = pd.concat([clusters[clust]['y_train'], y_pool])
-        # clusters[clust]['X_train'] = clusters[clust]['X_train']. \
-        #     append(train_pool_X.iloc[i, ])
-        # clusters[clust]['y_train'] = clusters[clust]['y_train'] \
-        #     .append(pd.Series([train_pool_y.iloc[i]]))
+
     # Remove clusters with no test instance.
     to_remove = [
         i for (i, d) in enumerate(clusters)
@@ -165,7 +159,6 @@ def burak_filter(self, test_set_X, test_set_domain, train_pool_X,
                 of which gives the confidence for the ith prediction.
             predictions: List of class predictions.
         """
-        print("=====", len(train_pool_X), len(train_pool_y))
         X_filtered, y_filtered = self.filter_instances(
             train_pool_X,
             train_pool_y,
@@ -221,8 +214,6 @@ class documentation for more information on the form of this method's
             )
             X_train_filtered = pd.concat([X_train_filtered, more_X_train])
             y_train_filtered = pd.concat([y_train_filtered, more_y_train])
-            # X_train_filtered = X_train_filtered.append(more_X_train)
-            # y_train_filtered = y_train_filtered.append(more_y_train)
 
         classifier = Base_Classifier(
             random_state=rand_seed,
diff --git a/tl_algs/ctl.py b/tl_algs/ctl.py
index b208b4a..af91066 100644
--- a/tl_algs/ctl.py
+++ b/tl_algs/ctl.py
@@ -1,9 +1,5 @@
-import numpy as np
-import pandas as pd
-import json
-import tl_alg 
+from tl_algs import tl_alg
 from sklearn.cluster import KMeans
-from sklearn.metrics.pairwise import euclidean_distances
 
 class ClusterThenLabel(tl_alg.Base_Transfer):
     """
diff --git a/tl_algs/trbag.py b/tl_algs/trbag.py
index afc1ef7..fc6e1d6 100644
--- a/tl_algs/trbag.py
+++ b/tl_algs/trbag.py
@@ -2,7 +2,7 @@
 import pandas as pd
 import json
 from tl_algs import tl_alg
-import voter
+from tl_algs import voter
 # from vuln_toolkit.common import vuln_metrics
 from sklearn.dummy import DummyClassifier
 from sklearn.metrics import f1_score 

From 48e3c76f9986865f63045e50e45385d9d19acbb3 Mon Sep 17 00:00:00 2001
From: Lip Wang <zqwang1993@gmail.com>
Date: Sun, 17 Jul 2022 21:09:23 -0400
Subject: [PATCH 2/2] fixed inner import issues

---
 tl_algs/burak.py       | 2 +-
 tl_algs/ctl.py         | 2 +-
 tl_algs/peters.py      | 2 +-
 tl_algs/tca.py         | 2 +-
 tl_algs/tca_plus.py    | 2 +-
 tl_algs/tl_baseline.py | 2 +-
 tl_algs/tnb.py         | 2 +-
 tl_algs/trbag.py       | 4 +---
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tl_algs/burak.py b/tl_algs/burak.py
index 88434c3..59d57b4 100644
--- a/tl_algs/burak.py
+++ b/tl_algs/burak.py
@@ -1,7 +1,7 @@
 import numpy as np
 import pandas as pd
 import json
-from tl_algs import tl_alg
+from . import tl_alg
 from sklearn.cluster import KMeans
 from sklearn.metrics.pairwise import euclidean_distances
 
diff --git a/tl_algs/ctl.py b/tl_algs/ctl.py
index af91066..07a1d5c 100644
--- a/tl_algs/ctl.py
+++ b/tl_algs/ctl.py
@@ -1,4 +1,4 @@
-from tl_algs import tl_alg
+from . import tl_alg
 from sklearn.cluster import KMeans
 
 class ClusterThenLabel(tl_alg.Base_Transfer):
diff --git a/tl_algs/peters.py b/tl_algs/peters.py
index f0d59a4..12d90a5 100644
--- a/tl_algs/peters.py
+++ b/tl_algs/peters.py
@@ -1,7 +1,7 @@
 import numpy as np
 import pandas as pd
 from sklearn.metrics.pairwise import euclidean_distances
-from tl_algs import tl_alg, burak
+from . import tl_alg, burak
 
 
 class Peters(tl_alg.Base_Transfer):
diff --git a/tl_algs/tca.py b/tl_algs/tca.py
index d907bcd..3cedc86 100644
--- a/tl_algs/tca.py
+++ b/tl_algs/tca.py
@@ -2,7 +2,7 @@
 import pandas as pd
 import json
 import da_tool.tca
-from tl_algs import tl_alg
+from . import tl_alg
 from sklearn.cluster import KMeans
 from sklearn.metrics.pairwise import euclidean_distances
 
diff --git a/tl_algs/tca_plus.py b/tl_algs/tca_plus.py
index 7e5ea3a..8123383 100644
--- a/tl_algs/tca_plus.py
+++ b/tl_algs/tca_plus.py
@@ -1,7 +1,7 @@
 import numpy as np
 import pandas as pd
 import json
-from tl_algs import tl_alg
+from . import tl_alg
 import da_tool.tca
 from sklearn.metrics.pairwise import euclidean_distances
 from scipy.stats import zscore
diff --git a/tl_algs/tl_baseline.py b/tl_algs/tl_baseline.py
index 47ca840..2e10897 100644
--- a/tl_algs/tl_baseline.py
+++ b/tl_algs/tl_baseline.py
@@ -1,7 +1,7 @@
 import numpy as np
 import pandas as pd
 import json
-from tl_algs import tl_alg
+from . import tl_alg
 
 
 class Target_Baseline(tl_alg.Base_Transfer):
diff --git a/tl_algs/tnb.py b/tl_algs/tnb.py
index 915b55e..8f1c159 100644
--- a/tl_algs/tnb.py
+++ b/tl_algs/tnb.py
@@ -1,7 +1,7 @@
 import numpy as np
 import pandas as pd
 import json
-from tl_algs import tl_alg
+from . import tl_alg
 
 
 def sim_minmax(column):
diff --git a/tl_algs/trbag.py b/tl_algs/trbag.py
index fc6e1d6..d1c6b67 100644
--- a/tl_algs/trbag.py
+++ b/tl_algs/trbag.py
@@ -1,9 +1,7 @@
 import numpy as np
 import pandas as pd
 import json
-from tl_algs import tl_alg
-from tl_algs import voter
-# from vuln_toolkit.common import vuln_metrics
+from . import tl_alg, voter
 from sklearn.dummy import DummyClassifier
 from sklearn.metrics import f1_score