diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregen.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregen.py index dd6224cff74b0f63b5147d550d21e7b756290eec..f4b6df25724fabb6686f7f04fa5b3f94b6d160cf 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregen.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregen.py @@ -40,6 +40,7 @@ class SCMPregen(scm, BaseMonoviewClassifier, PregenClassifier): file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" else: file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') @@ -57,6 +58,7 @@ class SCMPregen(scm, BaseMonoviewClassifier, PregenClassifier): file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" else: file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregenTree.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregenTree.py index 6634bb5aa1480c0cde606bc153c33a8b437cc820..5ead0cf96d21560ae3eb177f59db4d54574bc0e0 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregenTree.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregenTree.py @@ -42,6 +42,7 @@ class SCMPregenTree(scm, BaseMonoviewClassifier, PregenClassifier): file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" else: file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') @@ -59,6 +60,7 @@ class SCMPregenTree(scm, BaseMonoviewClassifier, PregenClassifier): file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" else: file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsity.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsity.py index 27745be1513fbe62cbb3f90bd0a22b36e5a04456..83c757f7ec83317605a1caaf0a13f438913cb583 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsity.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsity.py @@ -16,7 +16,7 @@ __status__ = "Prototype" # Production, Development, Prototype class SCMSparsity(BaseMonoviewClassifier, PregenClassifier): - def __init__(self, random_state=None, model_type="conjunction", + def __init__(self, random_state=None, model_type="disjunction", max_rules=10, p=0.1, n_stumps=1, self_complemented=True, **kwargs): self.scm_estimators = [scm( random_state=random_state, @@ -49,6 +49,7 @@ class SCMSparsity(BaseMonoviewClassifier, PregenClassifier): file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" else: file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') @@ -59,7 +60,7 @@ class SCMSparsity(BaseMonoviewClassifier, PregenClassifier): scm_estimator.fit(place_holder, y, tiebreaker=None, iteration_callback=None, **fit_params) end = time.time() self.times = np.array([end-beg, 0]) - self.train_metrics = [zero_one_loss.score(y, scm_estimator.predict(X)) for scm_estimator in self.scm_estimators] + self.train_metrics = [zero_one_loss.score(y, scm_estimator.predict(place_holder)) for scm_estimator in self.scm_estimators] return self.scm_estimators[-1] def predict(self, X): @@ -71,6 +72,7 @@ class SCMSparsity(BaseMonoviewClassifier, PregenClassifier): file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" else: file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsityTree.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsityTree.py index e28a99f1c8faec17f7bac255812d0f0982ea6160..bb2717336c04d9822cb883b1a185bd29b93c4a3e 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsityTree.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsityTree.py @@ -49,6 +49,7 @@ class SCMSparsityTree(BaseMonoviewClassifier, PregenClassifier): file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" else: file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') @@ -59,7 +60,7 @@ class SCMSparsityTree(BaseMonoviewClassifier, PregenClassifier): scm_estimator.fit(place_holder, y, tiebreaker=None, iteration_callback=None, **fit_params) end = time.time() self.times = np.array([end-beg, 0]) - self.train_metrics = [zero_one_loss.score(y, scm_estimator.predict(X)) for scm_estimator in self.scm_estimators] + self.train_metrics = [zero_one_loss.score(y, scm_estimator.predict(place_holder)) for scm_estimator in self.scm_estimators] return self.scm_estimators[-1] def predict(self, X): @@ -71,6 +72,7 @@ class SCMSparsityTree(BaseMonoviewClassifier, PregenClassifier): file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" else: file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',')