[WP] Fix orthogonal_mp method

lyhehehe · Aug 5, 2021 · 79961a4 · 79961a4
1 parent 7ea4697
commit 79961a4
Show file tree

Hide file tree

Showing 4 changed files with 318 additions and 148 deletions.
diff --git a/SciDataTool/Functions/omp.py b/SciDataTool/Functions/omp.py
@@ -32,8 +32,6 @@ def comp_DST(n: int) -> ndarray:
     return DST
 
 
-
-
 def comp_undersampling(K: float, Time: Data1D, seed: int=42) -> ndarray:
     """
     Compute an undersampled Data1D object with a K percentage of the initial samples

diff --git a/SciDataTool/Methods/DataND/orthogonal_mp.py b/SciDataTool/Methods/DataND/orthogonal_mp.py
@@ -7,8 +7,6 @@
 from SciDataTool.Classes.Data1D import Data1D
 from SciDataTool.Functions.omp import omp, comp_undersampled_axe
 
-# To prevent circular import
-#from SciDataTool.Classes.DataND import DataND as sdt_DataND
 
 def orthogonal_mp(self, Time: Data1D, n_coefs: int=None):
     """

diff --git a/Tests/Validation/test_omp.py b/Tests/Validation/test_omp.py
@@ -117,7 +117,7 @@ def f_2d(theta: ndarray, t: ndarray) -> ndarray:
     # Define the Time and Angle vector
     n = 100
     Time = Data1D(name="time", unit="s", values=linspace(0,1,n))
-    Angle = Data1D(name="angle", unit="{°}", values=linspace(0,45,10))
+    Angle = Data1D(name="angle", unit="{°}", values=linspace(0,45,70))
 
     # Compute a grid of the space and the resulting field
     time_coord, angle_coord = meshgrid(Time.get_values(), Angle.get_values())

diff --git a/Tutorials/tuto_4_Omp.ipynb b/Tutorials/tuto_4_Omp.ipynb
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,8 +32,6 @@ def comp_DST(n: int) -> ndarray: @@
         return DST
     def comp_undersampling(K: float, Time: Data1D, seed: int=42) -> ndarray:
         """
         Compute an undersampled Data1D object with a K percentage of the initial samples
@@ Expand Down @@