Merge pull request #1110 from ToFuProject/devel

Prepare 1.8.16

Author: Didou09

.github/workflows/test-complete-matrix.yml

@@ -20,9 +20,9 @@ jobs:
             os: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/test-single-linux.yml

@@ -17,9 +17,9 @@ jobs:
     strategy:
       max-parallel: 5
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install dependencies

requirements.txt

@@ -3,15 +3,16 @@ scipy
 numpy
 # scikit-sparse    # does not work on windows, and requires "apt/brew install libsuitesparse-dev/suite-sparse" on linux / MacOs
 # scikit-umfpack   # similar issue
-setuptools>=40.8.0, <64
-matplotlib
+# >=40.8.0, <64
+setuptools
+matplotlib>3.0.3
 contourpy
 requests
 svg.path
 Polygon3
 
 ######## Requirements with Version Specifier ########
 datastock>=0.0.54
-bsplines2d>=0.0.25
+bsplines2d>=0.0.27
 spectrally>=0.0.9
 Cython>=0.26

setup.py

@@ -312,19 +312,20 @@ def get_version_tofu(path=_HERE):
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=[
-        "setuptools>=40.8.0, <64",
+        # ">=40.8.0, <64",
+        "setuptools",
         "numpy",
         "scipy",
         # "scikit-sparse",
         # "scikit-umfpack",
-        "matplotlib",
+        "matplotlib>3.0.3",
         "contourpy",
         "requests",
         "svg.path",
         "Polygon3",
         "cython>=0.26",
         "datastock>=0.0.54",
-        "bsplines2d>=0.0.25",
+        "bsplines2d>=0.0.27",
         "spectrally>=0.0.9",
     ],
     python_requires=">=3.6",

tofu/data/_class00_poly2d_check.py

@@ -4,6 +4,9 @@
 """
 
 
+import warnings
+
+
 import numpy as np
 import datastock as ds
 
@@ -21,6 +24,7 @@ def check(
     # options
     closed=None,
     clockwise=None,
+    strict=None,
 ):
     """ High-level routine to format a 2d polygon
 
@@ -55,10 +59,11 @@ def check(
     # check inputs
     # -------------
 
-    key, close, clockwise = _check(
+    key, close, clockwise, strict = _check(
         key=key,
         closed=closed,
         clockwise=clockwise,
+        strict=strict,
     )
 
     # -------------
@@ -98,15 +103,29 @@ def check(
     # no duplicates
     # -------------
 
-    uni = np.unique([x0_closed[:-1], x1_closed[:-1]], axis=1)
+    uni, ind_uni = np.unique(
+        [x0_closed[:-1], x1_closed[:-1]],
+        axis=1,
+        return_index=True,
+    )
     if uni.shape[1] < (x0_closed.size - 1):
-        ndup = x0.size - 1 - uni.shape[1]
+        ind_dup = np.array([
+            ii for ii in range(x0_closed.size-1)
+            if ii not in ind_uni
+        ])
+        ndup = x0_closed.size - 1 - uni.shape[1]
         msg = (
             f"Polygon 2d '{key}' seems to have {ndup} duplicate points!\n"
-            "\t- x0 = {x0_closed[:-1]}\n"
-            "\t- x1 = {x1_closed[:-1]}\n"
+            f"\t- total nb of pts (with duplicates) = {x0_closed.size - 1}\n"
+            f"\t- total nb of pts (no duplicates) = {uni.shape[1]}\n"
+            f"\t- duplicates: {ndup}\n"
+            f"\t\t- x0 = {x0_closed[ind_dup]}\n"
+            f"\t\t- x1 = {x1_closed[ind_dup]}\n"
         )
-        raise Exception(msg)
+        if strict is True:
+            raise Exception(msg)
+        else:
+            warnings.warn(msg)
 
     # -------------
     # clockwise
@@ -143,6 +162,7 @@ def _check(
     key=None,
     closed=None,
     clockwise=None,
+    strict=None,
 ):
 
     # ---------------
@@ -175,7 +195,17 @@ def _check(
         default=True,
     )
 
-    return key, closed, clockwise
+    # ---------------
+    # strict
+    # ---------------
+
+    strict = ds._generic_check._check_var(
+        strict, 'strict',
+        types=bool,
+        default=True,
+    )
+
+    return key, closed, clockwise, strict
 
 
 # ###########################################################
@@ -186,4 +216,4 @@ def _check(
 
 def is_clockwise(x0, x1):
     area_signed = np.sum((x0[1:] - x0[:-1]) * (x1[1:] + x1[:-1]))
-    return area_signed > 0
+    return area_signed > 0

tofu/data/_class02_Rays.py

@@ -721,6 +721,7 @@ def save_rays_to_stp(
         # saving
         pfe_save=None,
         overwrite=None,
+        verb=None,
     ):
         """ Save a set of 'rays' to a stp file (CAD-readable)
 
@@ -761,4 +762,5 @@ def save_rays_to_stp(
             # saving
             pfe_save=pfe_save,
             overwrite=overwrite,
+            verb=verb,
         )

tofu/data/_class02_sample.py

@@ -197,9 +197,9 @@ def main(
         iok = np.isfinite(pts_x)
 
         # get shape of arrays based on max nb of points ()
-        nn = np.ceil(length_rad / res).astype(int)
+        nn = np.ceil(length_rad / res)
         nmax = np.nansum(nn, axis=0) + 1
-        shape = tuple(np.r_[np.nanmax(nmax), length_rad.shape[1:]])
+        shape = tuple(np.r_[int(np.nanmax(nmax)), length_rad.shape[1:]])
 
         # initialize arrays
         itot = np.full(shape, np.nan)
@@ -230,13 +230,14 @@ def main(
                 i0i = i0[ioki]
             else:
                 i0i = i0[sli2]
-            nni = nn[tuple([iokin] + list(ind))]
+            nni = nn[tuple([iokin] + list(ind))].astype(int)
 
             # itoti
             itoti = []
             anyok = False
             for jj in range(i0i.size - 1):
                 if np.all(np.isfinite(i0i[jj:jj+2])):
+
                     itoti.append(
                         np.linspace(
                             i0i[jj],
@@ -417,7 +418,6 @@ def main(
             # plt.plot(lengthtot)
             # plt.subplot(1,4,4)
             # plt.plot(kk*length + lengthtot)
-            # import pdb; pdb.set_trace()     # DB
 
             lout.append(kk*length + lengthtot)
 
@@ -625,4 +625,4 @@ def remove_consecutive_nans(arr):
     ind = np.nonzero(np.isnan(arr))[0]
     cons = np.r_[False, np.diff(ind) == 1]
 
-    return np.delete(arr, ind[cons])
+    return np.delete(arr, ind[cons])