Use of more recent version of numpy 1.14 or >

Author: AntSimi

setup.py

@@ -34,9 +34,9 @@
                            include_dirs=[numpy.get_include()])],
     package_data={'py_eddy_tracker.featured_tracking': ['*.nc', ]},
     setup_requires=[
-        'numpy>=1.8'],
+        'numpy>=1.14'],
     install_requires=[
-        'numpy>=1.9',
+        'numpy>=1.14',
         # Bug with 1.5.1 (slow memory leak)
         'matplotlib>=2.0.0',
         'scipy>=0.15.1',

src/py_eddy_tracker/observations.py

@@ -516,7 +516,7 @@ def basic_formula_ellips_major_axis(lats, cmin=1.5, cmax=10., c0=1.5, lat1=13.5,
         m = abs_lats > lat1
         m += abs_lats < lat2
 
-        major_axis[-m] = a * abs_lats[-m] + b
+        major_axis[~m] = a * abs_lats[~m] + b
         if not degrees:
             major_axis *= 111.2
         return major_axis
@@ -583,7 +583,7 @@ def solve_simultaneous(cost):
 
     @staticmethod
     def solve_first(cost, multiple_link=False):
-        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)
@@ -607,7 +607,7 @@ def solve_first(cost, multiple_link=False):
             # 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]):
@@ -647,8 +647,6 @@ def tracking(self, other):
         mask_accept_dist = self.mask_function(other)
         indexs_closest = where(mask_accept_dist)
 
-        # self.across_ground(self.obs[indexs_closest[0]], other.obs[indexs_closest[1]])
-
         cost_values = self.cost_function(
             self.obs[indexs_closest[0]],
             other.obs[indexs_closest[1]],
@@ -726,58 +724,6 @@ def elements(self):
         elements.extend(['track', 'segment_size', 'dlon', 'dlat'])
         return elements
 
-    @classmethod
-    def init_move_function(cls, obs_a, obs_b, out):
-        """Store information to init move function
-        """
-        out['dlon'] = obs_b['lon'] - obs_a['lon']
-        out['dlat'] = obs_b['lat'] - obs_a['lat']
-
-    @classmethod
-    def move_function(cls, obs_a, obs_b, out):
-        """Basic move on the previous one
-        Position N-2 : A
-        Position N-1 : B
-        Forecast Position : C
-
-        New position C = B + AB
-        """
-        out['lon'] = obs_b['lon'] + out['dlon']
-        out['lat'] = obs_b['lat'] + out['dlat']
-
-    @classmethod
-    def forecast_move(cls, obs_a, obs_b, out):
-        """Forecast move of an eddy
-        work to do
-        """
-        # New dead
-        for key in obs_b.dtype.fields.keys():
-            # Copy all parameters (which are not listed below)
-            # from the previous observations
-            if key in ['lon', 'lat', 'time', 'segment_size',
-                       'dlon', 'dlat'] or 'contour_' in key:
-                continue
-            out[key] = obs_b[key]
-        cls.init_move_function(obs_a, obs_b, out)
-        cls.move_function(obs_a, obs_b, out)
-
-        # Previous dead eddies
-        # Add previous virtual
-        if nb_virtual_extend > 0:
-            obs_to_extend = self.previous_virtual_obs.obs[i_virtual_dead_id
-                ][alive_virtual_obs]
-            for key in obs_b.dtype.fields.keys():
-                if key in ['lon', 'lat', 'time', 'track', 'segment_size',
-                           'dlon', 'dlat'] or 'contour_' in key:
-                    continue
-                out[key][nb_dead:] = obs_to_extend[key]
-            out['lon'][nb_dead:] = obs_to_extend['lon'] + obs_to_extend['dlon']
-            out['lat'][nb_dead:] = obs_to_extend['lat'] + obs_to_extend['dlat']
-            out['track'][nb_dead:] = obs_to_extend['track']
-            out['segment_size'][nb_dead:] = obs_to_extend['segment_size']
-        # Count
-        out['segment_size'][:] += 1
-
 
 class TrackEddiesObservations(EddiesObservations):
     """Class to practice Tracking on observations