Merge remote-tracking branch 'origin/feature/v4_docs_review' into fea…

…ture/v4_docs_review
SURGroup · Apr 8, 2022 · 823e331 · 823e331
2 parents a275ac7 + 3cb5f63
commit 823e331
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/docs/code/dimension_reduction/pod/plot_pod_1.py b/docs/code/dimension_reduction/pod/plot_pod_1.py
@@ -52,9 +52,8 @@
 
 start_time = time.time()
 
-pod = DirectPOD(solution_snapshots=Data, modes=1)
-pod.run()
-Data_reconstr =pod.reconstructed_solution
+pod = DirectPOD(solution_snapshots=Data, n_modes=1)
+Data_reconstr = pod.reconstructed_solution
 
 # %% md
 #

diff --git a/docs/code/dimension_reduction/pod/plot_pod_diffusion.py b/docs/code/dimension_reduction/pod/plot_pod_diffusion.py
@@ -85,8 +85,7 @@
 Data_modes = []
 
 for n_mode in n_modes:
-    pod = DirectPOD(solution_snapshots=Data, modes=n_mode)
-    pod.run()
+    pod = DirectPOD(solution_snapshots=Data, n_modes=n_mode)
     Data_reconstr = pod.reconstructed_solution
     Data_reduced = pod.reduced_solution
     Data_modes.append(Data_reconstr[:, :, frame])

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -42,7 +42,7 @@
     "sphinx.ext.viewcode",
     "sphinx.ext.githubpages",
     "sphinx.ext.autosummary",
-    "sphinx.ext.autosectionlabel",
+    # "sphinx.ext.autosectionlabel",
     "sphinx_autodoc_typehints",
     "sphinxcontrib.bibtex",
     "sphinx_gallery.gen_gallery",

diff --git a/src/UQpy/dimension_reduction/grassmann_manifold/GrassmannOperations.py b/src/UQpy/dimension_reduction/grassmann_manifold/GrassmannOperations.py
@@ -130,7 +130,8 @@ def frechet_variance(grassmann_points: Union[list[Numpy2DFloatArrayOrthonormal],
 
         variance_nominator = 0
         for i in range(points_number):
-            distances = distance.calculate_distance_matrix([reference_point, grassmann_points[i]], p_dim)
+            distance.calculate_distance_matrix([reference_point, grassmann_points[i]], p_dim)
+            distances = distance.distance_matrix
             variance_nominator += distances[0] ** 2
 
         return variance_nominator / points_number

diff --git a/src/UQpy/dimension_reduction/pod/baseclass/POD.py b/src/UQpy/dimension_reduction/pod/baseclass/POD.py
@@ -44,14 +44,19 @@ def __init__(self,
         if n_modes is None and reconstruction_percentage is None:
             raise ValueError("Either a number of modes or a reconstruction percentage must be chosen, not both.")
 
-        if reconstruction_percentage is not None  and reconstruction_percentage <= 0:
+        if reconstruction_percentage is not None and reconstruction_percentage <= 0:
             raise ValueError("Invalid input, the reconstruction percentage is defined in the range (0,100].")
 
+
+
         self.solution_snapshots = solution_snapshots
         self.logger = logging.getLogger(__name__)
         self.modes = n_modes
         self.reconstruction_percentage = reconstruction_percentage
 
+        if reconstruction_percentage is None:
+            self.reconstruction_percentage = 10**10
+
         if solution_snapshots is not None:
             self.run(solution_snapshots)
 
@@ -117,7 +122,7 @@ def run(self, solution_snapshots: Union[np.ndarray, list]):
                 "Number of dimensions is %i", n_iterations)
 
         reconstructed_solutions, reduced_solutions = \
-            self._calculate_reduced_and_reconstructed_solutions(u, phi, rows, columns, snapshot_number)
+            self._calculate_reduced_and_reconstructed_solutions(self.U, phi, rows, columns, snapshot_number)
 
         self.logger.info(f"UQpy: Successful execution of {type(self).__name__}!")