rename unfold -> recurrence, add-new unfold

This commit is contained in:
bolero-MURAKAMI 2012-09-28 13:15:17 +09:00
parent a9308ae3ee
commit b1b7a9fefc
19 changed files with 585 additions and 174 deletions

View file

@ -21,6 +21,8 @@
#include "./generate_n.cpp"
#include "./unfold.cpp"
#include "./unfold_n.cpp"
#include "./recurrence.cpp"
#include "./recurrence_n.cpp"
#include "./remove.cpp"
#include "./remove_if.cpp"
#include "./remove_copy.cpp"
@ -84,6 +86,8 @@ namespace testspr {
testspr::algorithm_fill_n_test();
testspr::algorithm_unfold_test();
testspr::algorithm_unfold_n_test();
testspr::algorithm_recurrence_test();
testspr::algorithm_recurrence_n_test();
testspr::algorithm_remove_test();
testspr::algorithm_remove_if_test();
testspr::algorithm_remove_copy_test();

View file

@ -0,0 +1,80 @@
#ifndef SPROUT_LIBS_ALGORITHM_TEST_RECURRENCE_CPP
#define SPROUT_LIBS_ALGORITHM_TEST_RECURRENCE_CPP
#include <sprout/algorithm/recurrence.hpp>
#include <sprout/array.hpp>
#include <sprout/sub_array.hpp>
#include <sprout/container.hpp>
#include <testspr/tools.hpp>
namespace testspr {
static void algorithm_recurrence_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}};
// 生成
{
SPROUT_STATIC_CONSTEXPR auto recurrenced = sprout::recurrence(
arr1,
testspr::x2<int>(),
2
);
TESTSPR_BOTH_ASSERT(testspr::equal(
recurrenced,
array<int, 10>{{2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}}
));
}
{
SPROUT_STATIC_CONSTEXPR auto recurrenced = sprout::fit::recurrence(
arr1,
testspr::x2<int>(),
2
);
TESTSPR_BOTH_ASSERT(testspr::equal(
recurrenced,
array<int, 10>{{2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}}
));
}
// 生成
// 範囲の切り出し
{
SPROUT_STATIC_CONSTEXPR auto recurrenced = sprout::recurrence(
sprout::sub(arr1, 2, 8),
testspr::x2<int>(),
2
);
TESTSPR_BOTH_ASSERT(testspr::equal(
recurrenced,
array<int, 6>{{2, 4, 8, 16, 32, 64}}
));
TESTSPR_BOTH_ASSERT(testspr::equal(
sprout::get_internal(recurrenced),
array<int, 10>{{1, 2, 2, 4, 8, 16, 32, 64, 9, 10}}
));
}
{
SPROUT_STATIC_CONSTEXPR auto recurrenced = sprout::fit::recurrence(
sprout::sub(arr1, 2, 8),
testspr::x2<int>(),
2
);
TESTSPR_BOTH_ASSERT(testspr::equal(
recurrenced,
array<int, 6>{{2, 4, 8, 16, 32, 64}}
));
TESTSPR_BOTH_ASSERT(testspr::equal(
sprout::get_internal(recurrenced),
array<int, 10>{{1, 2, 2, 4, 8, 16, 32, 64, 9, 10}}
));
}
}
}
} // namespace testspr
#ifndef TESTSPR_CPP_INCLUDE
# define TESTSPR_TEST_FUNCTION testspr::algorithm_recurrence_test
# include <testspr/include_main.hpp>
#endif
#endif // #ifndef SPROUT_LIBS_ALGORITHM_TEST_RECURRENCE_CPP

View file

@ -0,0 +1,84 @@
#ifndef SPROUT_LIBS_ALGORITHM_TEST_RECURRENCE_N_CPP
#define SPROUT_LIBS_ALGORITHM_TEST_RECURRENCE_N_CPP
#include <sprout/algorithm/recurrence_n.hpp>
#include <sprout/array.hpp>
#include <sprout/sub_array.hpp>
#include <sprout/container.hpp>
#include <testspr/tools.hpp>
namespace testspr {
static void algorithm_recurrence_n_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}};
// 生成
{
SPROUT_STATIC_CONSTEXPR auto recurrenced = sprout::recurrence_n(
arr1,
4,
testspr::x2<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
recurrenced,
array<int, 10>{{1, 2, 4, 8, 5, 6, 7, 8, 9, 10}}
));
}
{
SPROUT_STATIC_CONSTEXPR auto recurrenced = sprout::fit::recurrence_n(
arr1,
4,
testspr::x2<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
recurrenced,
array<int, 4>{{1, 2, 4, 8}}
));
}
// 生成
// 範囲の切り出し
{
SPROUT_STATIC_CONSTEXPR auto recurrenced = sprout::recurrence_n(
sprout::sub(arr1, 2, 8),
4,
testspr::x2<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
recurrenced,
array<int, 6>{{1, 2, 4, 8, 7, 8}}
));
TESTSPR_BOTH_ASSERT(testspr::equal(
sprout::get_internal(recurrenced),
array<int, 10>{{1, 2, 1, 2, 4, 8, 7, 8, 9, 10}}
));
}
{
SPROUT_STATIC_CONSTEXPR auto recurrenced = sprout::fit::recurrence_n(
sprout::sub(arr1, 2, 8),
4,
testspr::x2<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
recurrenced,
array<int, 4>{{1, 2, 4, 8}}
));
TESTSPR_BOTH_ASSERT(testspr::equal(
sprout::get_internal(recurrenced),
array<int, 10>{{1, 2, 1, 2, 4, 8, 7, 8, 9, 10}}
));
}
}
}
} // namespace testspr
#ifndef TESTSPR_CPP_INCLUDE
# define TESTSPR_TEST_FUNCTION testspr::algorithm_recurrence_n_test
# include <testspr/include_main.hpp>
#endif
#endif // #ifndef SPROUT_LIBS_ALGORITHM_TEST_RECURRENCE_N_CPP

View file

@ -11,29 +11,29 @@ namespace testspr {
static void algorithm_unfold_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}};
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{}};
// <20><EFBFBD>¬
{
SPROUT_STATIC_CONSTEXPR auto unfolded = sprout::unfold(
arr1,
testspr::x2<int>(),
2
testspr::unf_iota<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
unfolded,
array<int, 10>{{2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}}
array<int, 10>{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}}
));
}
{
SPROUT_STATIC_CONSTEXPR auto unfolded = sprout::fit::unfold(
arr1,
testspr::x2<int>(),
2
testspr::unf_iota<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
unfolded,
array<int, 10>{{2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}}
array<int, 10>{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}}
));
}
// <20><EFBFBD>¬
@ -41,31 +41,31 @@ namespace testspr {
{
SPROUT_STATIC_CONSTEXPR auto unfolded = sprout::unfold(
sprout::sub(arr1, 2, 8),
testspr::x2<int>(),
2
testspr::unf_iota<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
unfolded,
array<int, 6>{{2, 4, 8, 16, 32, 64}}
array<int, 6>{{1, 2, 3, 4, 5, 6}}
));
TESTSPR_BOTH_ASSERT(testspr::equal(
sprout::get_internal(unfolded),
array<int, 10>{{1, 2, 2, 4, 8, 16, 32, 64, 9, 10}}
array<int, 10>{{0, 0, 1, 2, 3, 4, 5, 6, 0, 0}}
));
}
{
SPROUT_STATIC_CONSTEXPR auto unfolded = sprout::fit::unfold(
sprout::sub(arr1, 2, 8),
testspr::x2<int>(),
2
testspr::unf_iota<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
unfolded,
array<int, 6>{{2, 4, 8, 16, 32, 64}}
array<int, 6>{{1, 2, 3, 4, 5, 6}}
));
TESTSPR_BOTH_ASSERT(testspr::equal(
sprout::get_internal(unfolded),
array<int, 10>{{1, 2, 2, 4, 8, 16, 32, 64, 9, 10}}
array<int, 10>{{0, 0, 1, 2, 3, 4, 5, 6, 0, 0}}
));
}
}

View file

@ -11,31 +11,31 @@ namespace testspr {
static void algorithm_unfold_n_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}};
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{}};
// <20><EFBFBD>¬
{
SPROUT_STATIC_CONSTEXPR auto unfolded = sprout::unfold_n(
arr1,
4,
testspr::x2<int>(),
testspr::unf_iota<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
unfolded,
array<int, 10>{{1, 2, 4, 8, 5, 6, 7, 8, 9, 10}}
array<int, 10>{{1, 2, 3, 4, 0, 0, 0, 0, 0, 0}}
));
}
{
SPROUT_STATIC_CONSTEXPR auto unfolded = sprout::fit::unfold_n(
arr1,
4,
testspr::x2<int>(),
testspr::unf_iota<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
unfolded,
array<int, 4>{{1, 2, 4, 8}}
array<int, 4>{{1, 2, 3, 4}}
));
}
// <20><EFBFBD>¬
@ -44,32 +44,32 @@ namespace testspr {
SPROUT_STATIC_CONSTEXPR auto unfolded = sprout::unfold_n(
sprout::sub(arr1, 2, 8),
4,
testspr::x2<int>(),
testspr::unf_iota<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
unfolded,
array<int, 6>{{1, 2, 4, 8, 7, 8}}
array<int, 6>{{1, 2, 3, 4, 0, 0}}
));
TESTSPR_BOTH_ASSERT(testspr::equal(
sprout::get_internal(unfolded),
array<int, 10>{{1, 2, 1, 2, 4, 8, 7, 8, 9, 10}}
array<int, 10>{{0, 0, 1, 2, 3, 4, 0, 0, 0, 0}}
));
}
{
SPROUT_STATIC_CONSTEXPR auto unfolded = sprout::fit::unfold_n(
sprout::sub(arr1, 2, 8),
4,
testspr::x2<int>(),
testspr::unf_iota<int>(),
1
);
TESTSPR_BOTH_ASSERT(testspr::equal(
unfolded,
array<int, 4>{{1, 2, 4, 8}}
array<int, 4>{{1, 2, 3, 4}}
));
TESTSPR_BOTH_ASSERT(testspr::equal(
sprout::get_internal(unfolded),
array<int, 10>{{1, 2, 1, 2, 4, 8, 7, 8, 9, 10}}
array<int, 10>{{0, 0, 1, 2, 3, 4, 0, 0, 0, 0}}
));
}
}