Skip to content

Fix tests #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonHH merged 2 commits into from
May 8, 2026
Merged

Fix tests #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4622c31
us np.testing.assert_array_equal in test_Tables.py to improve readabi…
SimonHH May 8, 2026
b4d4b57
use np.testing.assert_array_equal in test_signal.py
SimonHH May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/test_Tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def test_vstack(self):
name, df = tablist.vstack(commonOnly=True)
np.testing.assert_almost_equal(df['Index'], [0,1,2,3,4,5,6,7,8])
np.testing.assert_almost_equal(df['ColA'], np.concatenate((tab1.data['ColA'], tab2.data['ColA'], )))
np.testing.assert_equal(df.columns.values, ['Index','ColA'])
np.testing.assert_array_equal(df.columns.values, ['Index','ColA'])


def test_resample(self):
Expand Down Expand Up @@ -109,12 +109,12 @@ def test_change_units(self):
np.testing.assert_almost_equal(tab.data.values[:,1],[1])
np.testing.assert_almost_equal(tab.data.values[:,2],[2])
np.testing.assert_almost_equal(tab.data.values[:,3],[10])
np.testing.assert_equal(tab.columns, ['Index','om [rpm]', 'F [kN]', 'angle_[deg]'])
np.testing.assert_array_equal(tab.columns, ['Index','om [rpm]', 'F [kN]', 'angle_[deg]'])

def test_renameColumns(self):
tab = Table.createDummy(n=3, columns=['RtFldCp [-]','B1FldFx [N]', 'angle [rad]'])
tab.renameColumns(strReplDict={'Aero':'Fld'})
np.testing.assert_equal(tab.columns, ['Index','RtAeroCp [-]', 'B1AeroFx [N]', 'angle [rad]'])
np.testing.assert_array_equal(tab.columns, ['Index','RtAeroCp [-]', 'B1AeroFx [N]', 'angle [rad]'])

if __name__ == '__main__':
# TestTable.setUpClass()
Expand Down
16 changes: 8 additions & 8 deletions tests/test_signal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ def test_zero_crossings(self):
def test_up_down_sample(self):
name = 'Time-based'
x, y = applySampler(range(0, 4), [5, 0, 5, 0], {'name': name, 'param': [2]})
self.assertTrue(np.all(x==[0.5, 2.5]))
self.assertTrue(np.all(y==[2.5, 2.5]))
np.testing.assert_array_equal(x,[0.5, 2.5])
np.testing.assert_array_equal(y,[2.5, 2.5])
x, y = applySampler(range(0, 3), [5, 0, 5], {'name': name, 'param': [0.5]})
self.assertTrue(np.all(x==[0, 0.5, 1, 1.5, 2]))
self.assertTrue(np.all(y==[5, 2.5, 0, 2.5, 5]))
np.testing.assert_array_equal(x,[0, 0.5, 1, 1.5, 2])
np.testing.assert_array_equal(y,[5, 2.5, 0, 2.5, 5])
x, df = applySampler(range(0, 6), None, {'name': name, 'param': [3]}, pd.DataFrame({"y": [0, 6, 6, 2, -4, -4]}))
self.assertTrue(np.all(x==[1, 4]))
self.assertTrue(np.all(df["y"]==[4, -2]))
np.testing.assert_array_equal(x,[1, 4])
np.testing.assert_array_equal(df["y"],[4, -2])
x, df = applySampler(range(0, 3), None, {'name': name, 'param': [0.5]}, pd.DataFrame({"y": [0, 6, -6]}))
self.assertTrue(np.all(x==[0, 0.5, 1, 1.5, 2]))
self.assertTrue(np.all(df["y"]==[0, 3, 6, 0, -6]))
np.testing.assert_array_equal(x,[0, 0.5, 1, 1.5, 2])
np.testing.assert_array_equal(df["y"],[0, 3, 6, 0, -6])

def test_interpDF(self):

Expand Down