asdf

wesleybeckner · Nov 2, 2018 · 67e0ae3 · 67e0ae3
1 parent 7a0fdca
commit 67e0ae3
Show file tree

Hide file tree

Showing 3 changed files with 2,064 additions and 3 deletions.
diff --git a/salty/core.py b/salty/core.py
@@ -55,7 +55,6 @@ def assign_category(salts):
         label = "Molecular Relative"
     else:
         print("No salt-name column found in DataFrame")
-        raise BaseException
     category = []
     missed = []
     for i in range(salts.shape[0]):

diff --git a/salty/tests/test_data_manipulation.py b/salty/tests/test_data_manipulation.py
@@ -35,8 +35,7 @@ def test_4_assign_category(self):
         with_relative.drop(columns='name-cation', inplace=True)
         missed_entry_test = salty.assign_category(with_relative)
         data = salty.assign_category(self.devmodel1.Data)
-        no_column_test = salty.assign_category(pd.DataFrame())
-        return data, missed_entry_test, no_column_test
+        return data, missed_entry_test
 
     def test_benchmark(self):
         salty.Benchmark.run(self.test_1_aggregate_data)

diff --git a/scripts/vae/wes_vae_two.ipynb b/scripts/vae/wes_vae_two.ipynb