diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregen.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregen.py index 6ee4f62c90135803ce6d788e0cbe6451e6ed3010..b92cd0445867a269dacc2e094ab8f93d1f60bdf1 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregen.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregen.py @@ -34,13 +34,14 @@ class SCMPregen(scm, BaseMonoviewClassifier, PregenClassifier): def fit(self, X, y, tiebreaker=None, iteration_callback=None, **fit_params): pregen_X, _ = self.pregen_voters(X, y) list_files = os.listdir(".") - if "pregen_x.csv" in list_files: - i = 0 - file_name = "pregen_x" + str(i) + ".csv" + a = int(np.random.randint(0, 10000)) + if "pregen_x"+str(a)+".csv" in list_files: + a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: - i += 1 + a = int(np.random.randint(0, 10000)) else: - file_name="pregen_x.csv" + file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') place_holder = np.genfromtxt(file_name, delimiter=',') os.remove(file_name) diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregenTree.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregenTree.py index b2f59c39d6b59feeb8c89aa079e4c20ed7d18b76..9ce31788d118bc99c3c2c0d46deaa5b929268d2d 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregenTree.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMPregenTree.py @@ -36,13 +36,14 @@ class SCMPregenTree(scm, BaseMonoviewClassifier, PregenClassifier): def fit(self, X, y, tiebreaker=None, iteration_callback=None, **fit_params): pregen_X, _ = self.pregen_voters(X, y, generator="Trees") list_files = os.listdir(".") - if "pregen_x.csv" in list_files: - i = 0 - file_name = "pregen_x" + str(i) + ".csv" + a = int(np.random.randint(0, 10000)) + if "pregen_x"+str(a)+".csv" in list_files: + a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: - i += 1 + a = int(np.random.randint(0, 10000)) else: - file_name = "pregen_x.csv" + file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') place_holder = np.genfromtxt(file_name, delimiter=',') os.remove(file_name) @@ -52,13 +53,14 @@ class SCMPregenTree(scm, BaseMonoviewClassifier, PregenClassifier): def predict(self, X): pregen_X, _ = self.pregen_voters(X, generator="Trees") list_files = os.listdir(".") - if "pregen_x.csv" in list_files: - i = 0 - file_name = "pregen_x" + str(i) + ".csv" + a = int(np.random.randint(0, 10000)) + if "pregen_x"+str(a)+".csv" in list_files: + a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: - i += 1 + a = int(np.random.randint(0, 10000)) else: - file_name="pregen_x.csv" + file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') place_holder = np.genfromtxt(file_name, delimiter=',') os.remove(file_name) diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsity.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsity.py index 05f7e25746371b50a91e42a4d389cfc0a3680685..62b8ee8ebaa16ea046810f448231ad0c9484a874 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsity.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsity.py @@ -43,13 +43,14 @@ class SCMSparsity(BaseMonoviewClassifier, PregenClassifier): def fit(self, X, y, tiebreaker=None, iteration_callback=None, **fit_params): pregen_X, _ = self.pregen_voters(X, y) list_files = os.listdir(".") - if "pregen_x.csv" in list_files: - i = 0 - file_name = "pregen_x" + str(i) + ".csv" + a = int(np.random.randint(0, 10000)) + if "pregen_x"+str(a)+".csv" in list_files: + a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: - i += 1 + a = int(np.random.randint(0, 10000)) else: - file_name = "pregen_x.csv" + file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') place_holder = np.genfromtxt(file_name, delimiter=',') os.remove(file_name) diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsityTree.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsityTree.py index e7cbad62c231fe6809b91c85bba40c3557fa2612..bd883c61db2c039791f77788f6d8b8f238d7473b 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsityTree.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/SCMSparsityTree.py @@ -43,13 +43,14 @@ class SCMSparsityTree(BaseMonoviewClassifier, PregenClassifier): def fit(self, X, y, tiebreaker=None, iteration_callback=None, **fit_params): pregen_X, _ = self.pregen_voters(X, y, generator="Trees") list_files = os.listdir(".") - if "pregen_x.csv" in list_files: - i = 0 - file_name = "pregen_x" + str(i) + ".csv" + a = int(np.random.randint(0, 10000)) + if "pregen_x"+str(a)+".csv" in list_files: + a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: - i += 1 + a = int(np.random.randint(0, 10000)) else: - file_name = "pregen_x.csv" + file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') place_holder = np.genfromtxt(file_name, delimiter=',') os.remove(file_name) @@ -64,13 +65,14 @@ class SCMSparsityTree(BaseMonoviewClassifier, PregenClassifier): def predict(self, X): pregen_X, _ = self.pregen_voters(X, generator="Trees") list_files = os.listdir(".") - if "pregen_x.csv" in list_files: - i=0 - file_name="pregen_x"+str(i)+".csv" + a = int(np.random.randint(0, 10000)) + if "pregen_x"+str(a)+".csv" in list_files: + a = int(np.random.randint(0, 10000)) + file_name = "pregen_x" + str(a) + ".csv" while file_name in list_files: - i+=1 + a = int(np.random.randint(0, 10000)) else: - file_name="pregen_x.csv" + file_name = "pregen_x"+str(a)+".csv" np.savetxt(file_name, pregen_X, delimiter=',') place_holder = np.genfromtxt(file_name, delimiter=',') os.remove(file_name)