More fixes for TypeError: The numpy boolean negative

Author: emason

src/py_eddy_tracker/observations.py

@@ -363,7 +363,7 @@ def load_from_netcdf(cls, filename):
         return eddies
 
     @staticmethod
-    def cost_function(records_in, records_out, distance):
+    def cost_function2(records_in, records_out, distance):
         nb_records = records_in.shape[0]
         costs = ma.empty(nb_records,dtype='f4')
         for i_record in xrange(nb_records):
@@ -390,8 +390,8 @@ def mask_function(self, other):
         return self.circle_mask(other, radius=125)
 
     @staticmethod
-    def cost_function2(records_in, records_out, distance):
-        m = EddiesObservations.across_ground(records_in, records_out, distance)
+    def cost_function(records_in, records_out, distance):
+        #m = EddiesObservations.across_ground(records_in, records_out, distance)
         cost = ((records_in['amplitude'] - records_out['amplitude']
                  ) / records_in['amplitude']
                 ) ** 2
@@ -401,7 +401,7 @@ def cost_function2(records_in, records_out, distance):
         cost += (distance / 125) ** 2
         cost **= 0.5
         # Mask value superior at 60 % of variation
-        return ma.array(cost, mask=m)
+        #return ma.array(cost, mask=m)
         return cost
 
     def circle_mask(self, other, radius=100):
@@ -502,7 +502,7 @@ def solve_conflict(cost):
 
     @staticmethod
     def solve_simultaneous(cost):
-        mask = -cost.mask
+        mask = ~cost.mask
         # Count number of link by self obs and other obs
         self_links = mask.sum(axis=1)
         other_links = mask.sum(axis=0)
@@ -526,7 +526,7 @@ def solve_simultaneous(cost):
             # Cost to resolve conflict
             cost_reduce = cost[i_self_keep][:, i_other_keep]
             shape = cost_reduce.shape
-            nb_conflict = (-cost_reduce.mask).sum()
+            nb_conflict = (~cost_reduce.mask).sum()
             logging.debug('Shape conflict matrix : %s, %d conflicts', shape, nb_conflict)
 
             if nb_conflict >= (shape[0] + shape[1]):
@@ -630,7 +630,7 @@ def tracking(self, other):
             dist[mask_accept_dist])
 
         cost_mat = ma.empty(mask_accept_dist.shape, dtype='f4')
-        cost_mat.mask = -mask_accept_dist
+        cost_mat.mask = ~mask_accept_dist
         cost_mat[mask_accept_dist] = cost_values
 
         i_self, i_other = self.solve_function(cost_mat)
@@ -720,8 +720,8 @@ def filled_by_interpolation(self, mask):
             var = field[0]
             if var in ['n', 'virtual', 'track'] or var in self.array_variables:
                 continue
-            self.obs[var][mask] = interp(index[mask], index[-mask],
-                                         self.obs[var][-mask])
+            self.obs[var][mask] = interp(index[mask], index[~mask],
+                                         self.obs[var][~mask])
 
     def extract_longer_eddies(self, nb_min, nb_obs, compress_id=True):
         """Select eddies which are longer than nb_min

src/py_eddy_tracker/tracking.py

@@ -447,7 +447,7 @@ def merge(self, until=-1):
             index_final = self.i_current_by_tracks[i_id]
 
             # First obs of eddies
-            m_first_obs = -first_obs_save_in_tracks[i_id]
+            m_first_obs = ~first_obs_save_in_tracks[i_id]
             if m_first_obs.any():
                 # Index in the previous file
                 index_in = self[i]['in'][m_first_obs]