allocator is gone, accepting any sequence in python for fill is back, refactoring in adaptive_storage

This commit is contained in:
Hans Dembinski
2017-11-05 21:54:14 +01:00
parent feadbcd05b
commit 76c596dfc4
16 changed files with 539 additions and 426 deletions

View File

@@ -113,13 +113,13 @@ int main() {
6000000, itype));
printf("hs_sd %.3f\n",
compare_1d<histogram<Static,mpl::vector<axis::regular<>>,
adaptive_storage<>>>(6000000, itype));
adaptive_storage>>(6000000, itype));
printf("hd_ss %.3f\n",
compare_1d<histogram<Dynamic, builtin_axes,
array_storage<int>>>(
6000000, itype));
printf("hd_sd %.3f\n",
compare_1d<histogram<Dynamic, builtin_axes, adaptive_storage<>>>(
compare_1d<histogram<Dynamic, builtin_axes, adaptive_storage>>(
6000000, itype));
}
@@ -136,13 +136,13 @@ int main() {
printf("hs_sd %.3f\n",
compare_2d<histogram<Static,
mpl::vector<axis::regular<>, axis::regular<>>,
adaptive_storage<>>>(6000000, itype));
adaptive_storage>>(6000000, itype));
printf("hd_ss %.3f\n",
compare_2d<histogram<Dynamic, builtin_axes,
array_storage<int>>>(
6000000, itype));
printf("hd_sd %.3f\n",
compare_2d<histogram<Dynamic, builtin_axes, adaptive_storage<>>>(
compare_2d<histogram<Dynamic, builtin_axes, adaptive_storage>>(
6000000, itype));
}
@@ -159,13 +159,13 @@ int main() {
printf("hs_sd %.3f\n",
compare_3d<histogram<Static,
mpl::vector<axis::regular<>, axis::regular<>, axis::regular<>>,
adaptive_storage<>>>(6000000, itype));
adaptive_storage>>(6000000, itype));
printf("hd_ss %.3f\n",
compare_3d<histogram<Dynamic, builtin_axes,
array_storage<int>>>(
6000000, itype));
printf("hd_sd %.3f\n",
compare_3d<histogram<Dynamic, builtin_axes, adaptive_storage<>>>(
compare_3d<histogram<Dynamic, builtin_axes, adaptive_storage>>(
6000000, itype));
}
@@ -184,13 +184,13 @@ int main() {
compare_6d<histogram<Static,
mpl::vector<axis::regular<>, axis::regular<>, axis::regular<>,
axis::regular<>, axis::regular<>, axis::regular<>>,
adaptive_storage<>>>(6000000, itype));
adaptive_storage>>(6000000, itype));
printf("hd_ss %.3f\n",
compare_6d<histogram<Dynamic, builtin_axes,
array_storage<int>>>(
6000000, itype));
printf("hd_sd %.3f\n",
compare_6d<histogram<Dynamic, builtin_axes, adaptive_storage<>>>(
compare_6d<histogram<Dynamic, builtin_axes, adaptive_storage>>(
6000000, itype));
}
}