Fixed syntax for new version

ElM2D/ElM2D.py

@@ -350,7 +350,7 @@ def _process_list(self, formula_list, n_proc):
         self.input_mat = np.ndarray(shape=(len(formula_list), 103), dtype=np.float64)
 
         for i, formula in enumerate(formula_list):
-            self.input_mat[i] = ElMD(formula, metric=self.metric).vector_form
+            self.input_mat[i] = ElMD(formula, metric=self.metric).ratio_vector
 
         # Create input pairings
         if self.verbose: 
@@ -386,9 +386,13 @@ def _pool_ElMD(self, input_tuple):
         Uses multiprocessing module to call the numba compiled EMD function
         '''
         distances = np.ndarray(len(input_tuple))
-
+        elmd_obj = ElMD(metric=self.metric)
+
         for i, (input_1, input_2) in enumerate(input_tuple):
-            distances[i] = EMD(self.input_mat[input_1], self.input_mat[input_2])
+            distances[i] = EMD(self.input_mat[input_1], 
+                               self.input_mat[input_2],
+                               elmd_obj.lookup,
+                               elmd_obj.periodic_tab[self.metric])
 
         return distances
 
@@ -398,6 +402,9 @@ def __repr__(self):
         else:
             return f"ElM2D()"
 
+    def features(self):
+
+
     def export_dm(self, path):
         np.savetxt(path, self.dm, delimiter=",")
 

setup.py

@@ -2,13 +2,13 @@
 setup(
   name = 'ElM2D',        
   packages = ['ElM2D'],  
-  version = '0.3.1',      
+  version = '0.3.2',      
   license='GPL3',       
   description = 'A high performance mapping class to embed large datasets of ionic compositions with respect to the ElMD metric.',  
   author = 'Cameron Hagreaves',              
   author_email = 'cameron.h@rgreaves.me.uk', 
   url = 'https://github.com/lrcfmd/ElM2D/',   
-  download_url = 'https://github.com/lrcfmd/ElM2D/archive/0.3.1.tar.gz',    
+  download_url = 'https://github.com/lrcfmd/ElM2D/archive/0.3.2.tar.gz',    
   keywords = ['ChemInformatics', 'Materials Science', 'Machine Learning', 'Materials Representation'],   
   install_requires=[            
           'cython',