change names of ensemble models

albahnsen · May 18, 2015 · b3ff3ce · b3ff3ce
1 parent 1a7ad28
commit b3ff3ce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/costcla/models/__init__.py b/costcla/models/__init__.py
@@ -8,12 +8,16 @@
 
 from regression import CostSensitiveLogisticRegression
 
-from cost_ensemble import PastingCostSensitiveDecisionTreeClassifier
-from cost_ensemble import RandomPatchesCostSensitiveDecisionTreeClassifier
-from cost_ensemble import BaggingCostSensitiveDecisionTreeClassifier
+from cost_ensemble import CostSensitivePastingClassifier
+from cost_ensemble import CostSensitiveBaggingClassifier
+from cost_ensemble import CostSensitiveRandomPatchesClassifier
 from cost_ensemble import CostSensitiveRandomForestClassifier
 
 __all__ = ['BayesMinimumRiskClassifier',
            'ThresholdingOptimization',
            'CostSensitiveLogisticRegression',
-           'CostSensitiveDecisionTreeClassifier']
+           'CostSensitiveDecisionTreeClassifier',
+           'CostSensitivePastingClassifier',
+           'CostSensitiveBaggingClassifier',
+           'CostSensitiveRandomPatchesClassifier',
+           'CostSensitiveRandomForestClassifier']
diff --git a/costcla/models/cost_ensemble.py b/costcla/models/cost_ensemble.py
@@ -6,8 +6,8 @@
 # License: BSD 3 clause
 
 from sklearn.cross_validation import train_test_split
-from costcla.models import CostSensitiveDecisionTreeClassifier
-from costcla.models.bagging import BaggingClassifier
+from ..models import CostSensitiveDecisionTreeClassifier
+from ..models.bagging import BaggingClassifier
 
 #TODO add documentation for all methods
 class CostSensitiveRandomForestClassifier(BaggingClassifier):
@@ -32,7 +32,7 @@ def __init__(self,
         self.pruned = pruned
 
 
-class BaggingCostSensitiveDecisionTreeClassifier(BaggingClassifier):
+class CostSensitiveBaggingClassifier(BaggingClassifier):
     def __init__(self,
                  n_estimators=10,
                  max_samples=0.5,
@@ -54,7 +54,7 @@ def __init__(self,
         self.pruned = pruned
 
 
-class PastingCostSensitiveDecisionTreeClassifier(BaggingClassifier):
+class CostSensitivePastingClassifier(BaggingClassifier):
     def __init__(self,
                  n_estimators=10,
                  max_samples=0.5,
@@ -76,7 +76,7 @@ def __init__(self,
         self.pruned = pruned
 
 
-class RandomPatchesCostSensitiveDecisionTreeClassifier(BaggingClassifier):
+class CostSensitiveRandomPatchesClassifier(BaggingClassifier):
     def __init__(self,
                  n_estimators=10,
                  max_samples=0.5,