typo stack_powers

STAIRlab · Aug 30, 2024 · 1366f32 · 1366f32
1 parent f21dde4
commit 1366f32
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 149 deletions.
diff --git a/Makefile b/Makefile
@@ -5,9 +5,8 @@ NOTEBOOKS = notebooks/00_Overview.ipynb \
             notebooks/02_SISO_Event.ipynb \
             notebooks/03_SISO_History.ipynb \
             notebooks/04_MIMO_Intro.ipynb \
-	    	notebooks/06_MIMO_History.ipynb \
-			../mdof_studies/PeakPicking.ipynb \
-			../mdof_studies/PowerSpectrum.ipynb
+	    notebooks/06_MIMO_History.ipynb \
+	    ../mdof_studies/PowerSpectrum.ipynb
 
 
 test:
@@ -17,7 +16,7 @@ test:
 
 publish: test
 	cp -r _build/html/* site/
-	git.exe add site && git.exe commit -m'cc - rebuild site' && git.exe subtree push --prefix site origin gh-pages
+	git add site && git commit -m'cc - rebuild site' && git subtree push --prefix site origin gh-pages
 
 # Minimal makefile for Sphinx documentation
 #

diff --git a/notebooks/06_MIMO_History.ipynb b/notebooks/06_MIMO_History.ipynb
diff --git a/src/mdof/construct.py b/src/mdof/construct.py
@@ -10,7 +10,7 @@ def stack_powers(A,n_pwr, axis=None):
     A_p = np.eye(n)
     for pwr in range(0,n_pwr):
         powers_A[pwr] = A_p
-        A@A_p
+        A_p = A@A_p
     return powers_A
 
 

diff --git a/src/mdof/influence.py b/src/mdof/influence.py
@@ -52,8 +52,9 @@ def ac2bd(inputs, outputs, A, C, **options):
 
     # First block column of Phi 
     CA_powers = C@stack_powers(A, n_pwr=N)
-    for i in range(N):
-        Phi[i*p:(i+1)*p, :n] = CA_powers[i]
+    # for i in range(N):
+    #     Phi[i*p:(i+1)*p, :n] = CA_powers[i]
+    Phi[:,:n] = CA_powers.reshape(N*p,n)
 
     # Second block column of Phi
     for i in range(N):