Interim checking, Convolution Reverb

This commit is contained in:
Robin Davies
2023-04-05 03:00:51 -04:00
parent ed1dc75c53
commit b83ba7ca94
115 changed files with 7643 additions and 3055 deletions
+85 -99
View File
@@ -23,7 +23,6 @@
#include <cstdint>
#include <string>
#include "json.hpp"
#include "json_variant.hpp"
#include <concepts>
@@ -31,60 +30,53 @@
using namespace pipedal;
class JsonTestTarget {
class JsonTestTarget
{
private:
JsonTestTarget(const JsonTestTarget&) {} // hide copy constructor.
JsonTestTarget& operator=(const JsonTestTarget&) { return *this;} // hide assignment.
public:
JsonTestTarget(const JsonTestTarget &) {} // hide copy constructor.
JsonTestTarget &operator=(const JsonTestTarget &) { return *this; } // hide assignment.
public:
JsonTestTarget() // make sure reading works without a default cosntructor.
{
}
bool operator==(const JsonTestTarget &other) const
{
return this->int_ == other.int_
&& this->float_ == other.float_
&& this->double_ == other.double_
&& this->string_ == other.string_
&& std::equal(this->ints_.begin(),this->ints_.end(), other.ints_.begin(),other.ints_.end())
&& std::equal(this->strings_.begin(),this->strings_.end(), other.strings_.begin(),other.strings_.end())
;
return this->int_ == other.int_ && this->float_ == other.float_ && this->double_ == other.double_ && this->string_ == other.string_ && std::equal(this->ints_.begin(), this->ints_.end(), other.ints_.begin(), other.ints_.end()) && std::equal(this->strings_.begin(), this->strings_.end(), other.strings_.begin(), other.strings_.end());
}
public:
int int_ = 1;
float float_ = 3;
double double_ = 4;
public:
std::string string_{"5"};
std::vector<int> ints_ { 1,2,3,4,5};
std::vector<std::string> strings_ { "a","b","c","d"};
std::vector<std::vector<int> > compound_array_ { { 1,2},{3},{4,5,6},{9}};
std::vector<int> ints_{1, 2, 3, 4, 5};
std::vector<std::string> strings_{"a", "b", "c", "d"};
std::vector<std::vector<int>> compound_array_{{1, 2}, {3}, {4, 5, 6}, {9}};
public:
static json_map::storage_type<JsonTestTarget> jmap;
public:
JsonTestTarget(json_reader& reader)
JsonTestTarget(json_reader &reader)
{
#ifdef JUNK
#ifdef JUNK
while (true)
{
const char*name = reader.read_member_name();
if (name == nullptr)
const char *name = reader.read_member_name();
if (name == nullptr)
{
break;
}
}
#endif
#endif
}
};
json_map::storage_type<JsonTestTarget> JsonTestTarget::jmap {{
//json_map::reference("char_", &JsonTestTarget::char_),
json_map::storage_type<JsonTestTarget> JsonTestTarget::jmap{{
// json_map::reference("char_", &JsonTestTarget::char_),
json_map::reference("int", &JsonTestTarget::int_),
json_map::reference("floatt", &JsonTestTarget::float_),
json_map::reference("double", &JsonTestTarget::double_),
@@ -94,12 +86,11 @@ json_map::storage_type<JsonTestTarget> JsonTestTarget::jmap {{
json_map::reference("compoundarray", &JsonTestTarget::compound_array_),
}};
TEST_CASE( "json write", "[json_write_test]" ) {
TEST_CASE("json write", "[json_write_test]")
{
std::cout << "== json write ==" << std::endl;
std::stringstream os;
json_writer writer { os };
json_writer writer{os};
JsonTestTarget testTarget;
@@ -111,20 +102,19 @@ TEST_CASE( "json write", "[json_write_test]" ) {
static std::string get_json()
{
std::stringstream os;
json_writer writer { os };
json_writer writer{os};
JsonTestTarget testTarget;
writer.write(testTarget);
return os.str();
}
TEST_CASE( "json read", "[json_read_test]" ) {
TEST_CASE("json read", "[json_read_test]")
{
JsonTestTarget source;
source.ints_ = { 1,7,4};
source.ints_ = {1, 7, 4};
source.string_ = "xyz";
source.double_ = 99483.1837;
@@ -133,57 +123,53 @@ TEST_CASE( "json read", "[json_read_test]" ) {
writer.write(source);
std::string json = os.str();
std::stringstream input (json);
json_reader reader { input };
std::stringstream input(json);
json_reader reader{input};
JsonTestTarget dest;
reader.read(&dest);
REQUIRE(reader.is_complete());
REQUIRE( source == dest);
REQUIRE(source == dest);
JsonTestTarget *pDest;
std::stringstream input2(json);
json_reader reader2 { input2};
json_reader reader2{input2};
reader2.read(&pDest);
//JsonTestTarget *testTarget = reader.read_object<JsonTestTarget>();
// JsonTestTarget *testTarget = reader.read_object<JsonTestTarget>();
}
TEST_CASE( "json smart ptrs", "[json_smart_ptrs][Build][Dev]" ) {
std::string json =get_json();
TEST_CASE("json smart ptrs", "[json_smart_ptrs][Build][Dev]")
{
std::string json = get_json();
{
std::unique_ptr<JsonTestTarget> uniquePtr;
std::stringstream input(json);
json_reader reader { input };
reader.read(&uniquePtr);
json_reader reader{input};
reader.read(&uniquePtr);
}
{
std::shared_ptr<JsonTestTarget> sharedPtr;
std::stringstream input(json);
json_reader reader { input };
reader.read(&sharedPtr);
json_reader reader{input};
reader.read(&sharedPtr);
}
}
template <typename T>
void TestVariantRoundTrip(const T &value)
{
json_variant variant(value);
T out = variant.get<T>();
T out = variant.as<T>();
REQUIRE(out == value);
std::string output;
{
std::stringstream s;
json_writer writer(s);
writer.write(variant);
writer.write(variant);
output = s.str();
}
std::cout << output << std::endl;
@@ -191,11 +177,10 @@ void TestVariantRoundTrip(const T &value)
{
std::stringstream s(output);
json_reader reader(s);
json_variant outputVariant;
reader.read(&outputVariant);
REQUIRE(outputVariant == variant);
}
}
void TestVariantRoundTrip(json_variant &value)
@@ -207,7 +192,7 @@ void TestVariantRoundTrip(json_variant &value)
{
std::stringstream s;
json_writer writer(s);
writer.write(variant);
writer.write(variant);
output = s.str();
}
std::cout << output << std::endl;
@@ -223,14 +208,12 @@ void TestVariantRoundTrip(json_variant &value)
}
}
class X{
class X
{
public:
template<typename T>
requires std::derived_from<T,JsonSerializable>
bool write(T &v)
template <typename T>
requires std::derived_from<T, JsonSerializable> bool
write(T &v)
{
(void)v;
return true;
@@ -243,52 +226,55 @@ public:
}
};
void TestVariantSFINAE()
{
X x;
json_variant v;
dynamic_cast<JsonSerializable&>(v);
dynamic_cast<JsonSerializable &>(v);
REQUIRE(x.write(v) == true);
int i;
REQUIRE(x.write(i) == false);
}
TEST_CASE( "json variants", "[json_variants][Build][Dev]" ) {
TestVariantSFINAE();
json_variant v(0);
TestVariantRoundTrip(json_null());
TestVariantRoundTrip(0.0);
TestVariantRoundTrip(std::string("abc"));
json_array array;
array.push_back(json_null());
array.push_back(3.25E19);
array.push_back(std::string("abc"));
json_variant variantArray { std::move(array) };
TestVariantRoundTrip(variantArray);
TEST_CASE("json variants", "[json_variants][Build][Dev]")
{
{
json_object obj;
obj["a"] = json_null();
obj["b"] = 0.25;
obj["c"] = std::move(variantArray);
json_variant variantObj { std::move(obj)};
TestVariantRoundTrip(variantObj);
TestVariantSFINAE();
variantObj["a"] = std::string("abc");
TestVariantRoundTrip(variantObj);
TestVariantRoundTrip(0.0);
TestVariantRoundTrip(std::string("abc"));
TestVariantRoundTrip(json_null());
json_array array;
array.push_back(json_null());
array.push_back(3.25E19);
array.push_back(std::string("abc"));
json_variant variantArray{std::move(array)};
REQUIRE(array.size() == 0); // did it get moved property?
TestVariantRoundTrip(variantArray);
{
json_object obj;
obj["a"] = json_null();
obj["b"] = 0.25;
obj["c"] = std::move(variantArray);
json_variant variantObj{std::move(obj)};
REQUIRE((variantArray.is_null() || variantArray.size() == 0) == true); // did move happen?
REQUIRE(obj.size() == 0); // did move happen?
TestVariantRoundTrip(variantObj);
variantObj["a"] = std::string("abc");
TestVariantRoundTrip(variantObj);
}
{
json_variant x = json_variant::make_array();
x.resize(3);
x[0] = "def";
}
}
{
json_variant x = json_variant::MakeArray();
x.resize(3);
x[0] = "def";
}
}
REQUIRE(json_object::allocation_count() == 0);
REQUIRE(json_array::allocation_count() == 0);
}