From 459a5e1ab5a1f650394dc4aa11effd7ee9478dc5 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Tue, 20 May 2025 15:20:34 -0500 Subject: [PATCH 1/3] Fix typo --- quandary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quandary.py b/quandary.py index 10bb8503..3b81d4e7 100644 --- a/quandary.py +++ b/quandary.py @@ -871,7 +871,7 @@ def estimate_timesteps(*, T=1.0, Hsys=[], Hc_re=[], Hc_im=[], maxctrl_MHz=[], Pm def eigen_and_reorder(H0, verbose=False): - """ Internal function that computes eigen decomposition and re-orders it to make the eigenvector matrix as close to the identity as posiible """ + """ Internal function that computes eigen decomposition and re-orders it to make the eigenvector matrix as close to the identity as possible """ # Get eigenvalues and vectors and sort them in ascending order Ntot = H0.shape[0] From efed971b37c82e9cb82a3da948c141cb479ef63b Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Tue, 20 May 2025 15:20:55 -0500 Subject: [PATCH 2/3] Avoid using numpy matrix as that is deprecated --- quandary.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/quandary.py b/quandary.py index 3b81d4e7..3b59612b 100644 --- a/quandary.py +++ b/quandary.py @@ -876,7 +876,6 @@ def eigen_and_reorder(H0, verbose=False): # Get eigenvalues and vectors and sort them in ascending order Ntot = H0.shape[0] evals, evects = np.linalg.eig(H0) - evects = np.asmatrix(evects) # convert ndarray to matrix ? reord = np.argsort(evals) evals = evals[reord] evects = evects[:,reord] @@ -936,8 +935,8 @@ def get_resonances(*, Ne, Ng, Hsys, Hc_re=[], Hc_im=[], rotfreq=[], cw_amp_thres for q in range(nqubits): # Transform symmetric and anti-symmetric control Hamiltonians using eigenvectors (reordered) - Hsym_trans = Utrans.H @ Hc_re[q] @ Utrans - Hanti_trans = Utrans.H @ Hc_im[q] @ Utrans + Hsym_trans = Utrans.conj().T @ Hc_re[q] @ Utrans + Hanti_trans = Utrans.conj().T @ Hc_im[q] @ Utrans resonances_a = [] speed_a = [] From 9bc3c8fef2b8d1345a75dbf31fb19df9ee4d50e8 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Tue, 20 May 2025 16:18:33 -0500 Subject: [PATCH 3/3] Fix expected dataframe header in tests --- tests/regression/regression_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/regression/regression_test.py b/tests/regression/regression_test.py index adcca19f..2b5081f7 100644 --- a/tests/regression/regression_test.py +++ b/tests/regression/regression_test.py @@ -76,7 +76,7 @@ def run_test(simulation_dir, number_of_processes, config_file, files_to_compare, def compare_files(file_name, output, expected, exact): df_output = pd.read_csv(output, sep="\\s+", header=get_header(output)) - df_expected = pd.read_csv(expected, sep="\\s+", header=get_header(output)) + df_expected = pd.read_csv(expected, sep="\\s+", header=get_header(expected)) pd.testing.assert_frame_equal(df_output, df_expected, rtol=REL_TOL, atol=ABS_TOL, obj=file_name, check_exact=exact)