preliminary fix

This commit is contained in:
Hans Dembinski
2018-10-30 23:21:05 +01:00
parent fb80067aa5
commit e20243e9d4
3 changed files with 16 additions and 17 deletions

View File

@@ -12,7 +12,7 @@
#include <limits>
#include <memory>
#include <random>
#include "utility_histgram.hpp"
#include "utility_histogram.hpp"
using namespace boost::histogram;
using boost::mp11::mp_list;
@@ -132,9 +132,9 @@ int main() {
printf("uniform distribution\n");
else
printf("normal distribution\n");
printf("hs_ss %.3f\n", compare_1d<static_tag, array_storage<int>>(nfill, itype));
printf("hs_ss %.3f\n", compare_1d<static_tag, std::vector<int>>(nfill, itype));
printf("hs_sd %.3f\n", compare_1d<static_tag, adaptive_storage<>>(nfill, itype));
printf("hd_ss %.3f\n", compare_1d<dynamic_tag, array_storage<int>>(nfill, itype));
printf("hd_ss %.3f\n", compare_1d<dynamic_tag, std::vector<int>>(nfill, itype));
printf("hd_sd %.3f\n", compare_1d<dynamic_tag, adaptive_storage<>>(nfill, itype));
}
@@ -144,9 +144,9 @@ int main() {
printf("uniform distribution\n");
else
printf("normal distribution\n");
printf("hs_ss %.3f\n", compare_2d<static_tag, array_storage<int>>(nfill, itype));
printf("hs_ss %.3f\n", compare_2d<static_tag, std::vector<int>>(nfill, itype));
printf("hs_sd %.3f\n", compare_2d<static_tag, adaptive_storage<>>(nfill, itype));
printf("hd_ss %.3f\n", compare_2d<dynamic_tag, array_storage<int>>(nfill, itype));
printf("hd_ss %.3f\n", compare_2d<dynamic_tag, std::vector<int>>(nfill, itype));
printf("hd_sd %.3f\n", compare_2d<dynamic_tag, adaptive_storage<>>(nfill, itype));
}
@@ -156,9 +156,9 @@ int main() {
printf("uniform distribution\n");
else
printf("normal distribution\n");
printf("hs_ss %.3f\n", compare_3d<static_tag, array_storage<int>>(nfill, itype));
printf("hs_ss %.3f\n", compare_3d<static_tag, std::vector<int>>(nfill, itype));
printf("hs_sd %.3f\n", compare_3d<static_tag, adaptive_storage<>>(nfill, itype));
printf("hd_ss %.3f\n", compare_3d<dynamic_tag, array_storage<int>>(nfill, itype));
printf("hd_ss %.3f\n", compare_3d<dynamic_tag, std::vector<int>>(nfill, itype));
printf("hd_sd %.3f\n", compare_3d<dynamic_tag, adaptive_storage<>>(nfill, itype));
}
@@ -168,9 +168,9 @@ int main() {
printf("uniform distribution\n");
else
printf("normal distribution\n");
printf("hs_ss %.3f\n", compare_6d<static_tag, array_storage<int>>(nfill, itype));
printf("hs_ss %.3f\n", compare_6d<static_tag, std::vector<int>>(nfill, itype));
printf("hs_sd %.3f\n", compare_6d<static_tag, adaptive_storage<>>(nfill, itype));
printf("hd_ss %.3f\n", compare_6d<dynamic_tag, array_storage<int>>(nfill, itype));
printf("hd_ss %.3f\n", compare_6d<dynamic_tag, std::vector<int>>(nfill, itype));
printf("hd_sd %.3f\n", compare_6d<dynamic_tag, adaptive_storage<>>(nfill, itype));
}
}