Skip to content

Commit

Permalink
Updating test_stats
Browse files Browse the repository at this point in the history
  • Loading branch information
Treece Alexander Burgess committed Jun 27, 2023
2 parents daedb27 + 74c3ff0 commit e0aac68
Showing 1 changed file with 19 additions and 7 deletions.
26 changes: 19 additions & 7 deletions thicket/tests/test_stats.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def test_mean(example_cali):
th.mean(th_ens, columns=["Min time/rank"])

assert "Min time/rank_mean" in th_ens.statsframe.dataframe.columns

assert "Min time/rank_mean" in th_ens.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
assert "Min time/rank_mean" in th_ens.statsframe.show_metric_columns()

Expand All @@ -33,8 +34,8 @@ def test_mean_columnar_join(columnar_join_thicket):

#assert (idx, "Min time/rank_mean") in combined_th.statsframe.dataframe.columns
# pr #42 needs to be merged before the below asserts will work
#assert (idx, "min#inclusive#sum#time.duration_mean") in combined_th.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
#assert (idx, "min#inclusive#sum#time.duration_mean") in combined_th.stataframe.show_metric_columns()
# assert (idx, "min#inclusive#sum#time.duration_mean") in combined_th.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
# assert (idx, "min#inclusive#sum#time.duration_mean") in combined_th.stataframe.show_metric_columns()


def test_median(example_cali):
Expand All @@ -47,6 +48,7 @@ def test_median(example_cali):
th.median(th_ens, columns=["Min time/rank"])

assert "Min time/rank_median" in th_ens.statsframe.dataframe.columns

assert "Min time/rank_median" in th_ens.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
assert "Min time/rank_median" in th_ens.statsframe.show_metric_columns()

Expand Down Expand Up @@ -75,6 +77,7 @@ def test_minimum(example_cali):
th.minimum(th_ens, columns=["Min time/rank"])

assert "Min time/rank_min" in th_ens.statsframe.dataframe.columns

assert "Min time/rank_min" in th_ens.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
assert "Min time/rank_min" in th_ens.statsframe.show_metric_columns()

Expand Down Expand Up @@ -104,18 +107,26 @@ def test_maximum(example_cali):
th.maximum(th_ens, columns=["Min time/rank"])

assert "Min time/rank_max" in th_ens.statsframe.dataframe.columns

assert "Min time/rank_max" in th_ens.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
assert "Min time/rank_max" in th_ens.statsframe.show_metric_columns()


def test_maximum_columnar_join(columnar_join_thicket):

# pr #42 needs to be merged before the below asserts will work
# assert "min#inclusive#sum#time.duration_minimum" in th_ens.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
# assert "min#inclsuive#sum#time.duration_minimum" in th_ens.statsframe.show_metric_columns()


def test_minimum_columnar_join(columnar_join_thicket):
thicket_list, thicket_list_cp, combined_th = columnar_join_thicket
idx = combined_th.dataframe.columns.levels[0][0]
assert sorted(combined_th.dataframe.index.get_level_values(0).unique()) == sorted(combined_th.statsframe.dataframe.index.values)

assert list(combined_th.statsframe.dataframe.columns) == [("", "name")]

#th.minimum(combined_th, columns=[(idx, "Min time/rank")])
#th.maximum(combined_th, columns=[(idx, "Min time/rank")])

#assert (idx, "Min time/rank_max") in combined_th.statsframe.dataframe.columns
# pr #42 needs to be merged before the below asserts will work
Expand All @@ -133,10 +144,10 @@ def test_std(example_cali):
th.std(th_ens, columns=["Min time/rank"])

assert "Min time/rank_std" in th_ens.statsframe.dataframe.columns

assert "Min time/rank_std" in th_ens.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
assert "Min time/rank_std" in th_ens.statsframe.show_metric_columns()


def test_std_columnar_join(columnar_join_thicket):
thicket_list, thicket_list_cp, combined_th = columnar_join_thicket
idx = combined_th.dataframe.columns.levels[0][0]
Expand All @@ -162,25 +173,24 @@ def test_percentiles(example_cali):

assert "Min time/rank_percentiles" in th_ens.statsframe.dataframe.columns
assert len(th_ens.statsframe.dataframe["Min time/rank_percentiles"][0]) == 3

assert "Min time/rank_percentiles" in th_ens.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
assert "Min time/rank_percentiles" in th_ens.statsframe.show_metric_columns()


def test_percentiles_columnar_join(columnar_join_thicket):
thicket_list, thicket_list_cp, combined_th = columnar_join_thicket
idx = combined_th.dataframe.columns.levels[0][0]
assert sorted(combined_th.dataframe.index.get_level_values(0).unique()) == sorted(combined_th.statsframe.dataframe.index.values)

assert list(combined_th.statsframe.dataframe.columns) == [("", "name")]

# th.percentiles(combined_th, columns=[(idx, "min#inclusive#sum#time.duration")])
# th.percentiles(combined_th, columns=[(idx, "min#inclusive#sum#time.duration")

# assert (idx, "min#inclusive#sum#time.duration_percentiles") in combined_th.statsframe.dataframe.columns
# pr #42 needs to be merged before the below asserts will work
# assert (idx, "min#inclusive#sum#time.duration_percentiles") in combined_th.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
# assert (idx, "min#inclusive#sum#time.duration_percentiles") in combined_th.stataframe.show_metric_columns()


def test_variance(example_cali):
th_ens = th.Thicket.from_caliperreader(example_cali)

Expand Down Expand Up @@ -315,3 +325,5 @@ def test_boxplot_columnar_join(columnar_join_thicket):
# pr #42 needs to be merged before the below asserts will work
# assert (idx, "min#inclusive#sum#time.duration_std") in combined_th.statsframe.exc_metrics + th_ens.statsframe.inc_metrics
# assert (idx, "min#inclusive#sum#time.duration_std") in combined_th.stataframe.show_metric_columns()
=======
>>>>>>> 74c3ff0bfbcab85a982db09954ef4dcb638122e5

0 comments on commit e0aac68

Please sign in to comment.