Skip to content

Could it be this dumb? #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
weefuzzy wants to merge 7 commits into from
Closed

Could it be this dumb? #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
adb9329
Could it be this dumb?
weefuzzy Jul 14, 2025
79d2a57
dbg
weefuzzy Jul 14, 2025
a49bdd8
mor dbg
weefuzzy Jul 14, 2025
2574017
mor mor dbg
weefuzzy Jul 14, 2025
6d8259c
mor mor mor
weefuzzy Jul 14, 2025
8f62169
desperation intensifies
weefuzzy Jul 14, 2025
79de7ec
being sneaky
weefuzzy Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/flucoma-core-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, windows-latest, macOS-latest]
os: [windows-latest]
fail-fast: false

steps:
Expand Down
26 changes: 25 additions & 1 deletion include/flucoma/data/FluidTensor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,27 @@ class FluidTensor //: public FluidTensorBase<T,N>
{
static_assert(std::is_convertible<U, T>::value,
"Cannot convert between container value types");
std::copy(x.begin(), x.end(), mContainer.begin());

std::cout << "========== CONVERTER ===============\n";
for(auto& p: x) std::cout << p << ',';
std::cout << "\n==================================\n";
std::cout << "========== X ================\n";
std::cout << x;
std::cout << "\n==================================\n";
// std::copy(x.begin(), x.end(), mContainer.begin());
// std::transform(x.begin(), x.end(),mContainer.begin(),[](U in)->T
// {
// return static_cast<T>(in);
// });
*this = x;

std::cout << "========== MI CONTAINTER ================\n";
for(auto& p: mContainer) std::cout << p << ',';
std::cout << "\n==================================\n";
std::cout << "========== MEEE ================\n";
std::cout << *this;
std::cout << "\n==================================\n";

}

template <typename U, size_t M>
Expand Down Expand Up @@ -164,6 +184,10 @@ class FluidTensor //: public FluidTensorBase<T,N>
mContainer.reserve(asUnsigned(this->mDesc.size));
impl::insertFlat(init, mContainer);
assert(mContainer.size() == asUnsigned(this->mDesc.size));
std::cout << "checking assert condition\n";
std::cout << (mContainer.size() == asUnsigned(this->mDesc.size)) << '\n';
std::cout << "Look inside...\n" << *this;

}

template <typename U>
Expand Down
14 changes: 12 additions & 2 deletions include/flucoma/data/FluidTensor_Support.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,20 @@ std::array<index, N> deriveExtents(const List& list)
/// addList and insertFlat populate our container with the contents of
/// a nested initializer list structure.

template <class T, class Vec> // terminate
void addList(const T* first, const T* last, Vec& vec)
template <class InputIter, class Vec> // terminate
void addList(InputIter first, InputIter last, Vec& vec)
{

InputIter dum = first;
std::cout << "================Pre Insert===============\n";
for(;dum!=last; ++dum) std::cout << *dum << ',';
std::cout << '\n';

vec.insert(vec.end(), first, last);

std::cout << "================Post Insert===============\n";
for(const auto& x: vec) std::cout << x << ',';
std::cout << "\n==========================================\n";
}

template <class T, class Vec> // recurse
Expand Down
80 changes: 40 additions & 40 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,60 +93,60 @@ endfunction()

add_test_executable(TestFluidTensor data/TestFluidTensor.cpp)
add_test_executable(TestFluidTensorDeath data/death_tests/TestFluidTensorAsserts.cpp)
target_link_libraries(TestFluidTensorDeath PRIVATE
$<TARGET_OBJECTS:AbortHandler>
)
# target_link_libraries(TestFluidTensorDeath PRIVATE
# $<TARGET_OBJECTS:AbortHandler>
# )

add_test_executable(TestFluidTensorView data/TestFluidTensorView.cpp)
add_test_executable(TestFluidTensorSupport data/TestFluidTensorSupport.cpp)
add_test_executable(TestFluidDataSet data/TestFluidDataSet.cpp)
add_test_executable(TestFluidSource clients/common/TestFluidSource.cpp)
add_test_executable(TestFluidSink clients/common/TestFluidSink.cpp)
add_test_executable(TestBufferedProcess clients/common/TestBufferedProcess.cpp)
# add_test_executable(TestFluidTensorView data/TestFluidTensorView.cpp)
# add_test_executable(TestFluidTensorSupport data/TestFluidTensorSupport.cpp)
# add_test_executable(TestFluidDataSet data/TestFluidDataSet.cpp)
# add_test_executable(TestFluidSource clients/common/TestFluidSource.cpp)
# add_test_executable(TestFluidSink clients/common/TestFluidSink.cpp)
# add_test_executable(TestBufferedProcess clients/common/TestBufferedProcess.cpp)

add_test_executable(TestNoveltySeg
algorithms/public/TestNoveltySegmentation.cpp
)
add_test_executable(TestOnsetSeg algorithms/public/TestOnsetSegmentation.cpp)
add_test_executable(TestEnvelopeSeg algorithms/public/TestEnvelopeSegmentation.cpp)
# add_test_executable(TestNoveltySeg
# algorithms/public/TestNoveltySegmentation.cpp
# )
# add_test_executable(TestOnsetSeg algorithms/public/TestOnsetSegmentation.cpp)
# add_test_executable(TestEnvelopeSeg algorithms/public/TestEnvelopeSegmentation.cpp)

add_test_executable(TestEnvelopeGate algorithms/public/TestEnvelopeGate.cpp)
# add_test_executable(TestEnvelopeGate algorithms/public/TestEnvelopeGate.cpp)

add_test_executable(TestTransientSlice algorithms/public/TestTransientSlice.cpp)
# add_test_executable(TestTransientSlice algorithms/public/TestTransientSlice.cpp)

add_test_executable(TestMLP algorithms/public/TestMLP.cpp)
add_test_executable(TestKMeans algorithms/public/TestKMeans.cpp)
# add_test_executable(TestMLP algorithms/public/TestMLP.cpp)
# add_test_executable(TestKMeans algorithms/public/TestKMeans.cpp)

target_link_libraries(TestNoveltySeg PRIVATE TestSignals)
target_link_libraries(TestOnsetSeg PRIVATE TestSignals)
target_link_libraries(TestEnvelopeSeg PRIVATE TestSignals)
target_link_libraries(TestEnvelopeGate PRIVATE TestSignals)
target_link_libraries(TestTransientSlice PRIVATE TestSignals)
# target_link_libraries(TestNoveltySeg PRIVATE TestSignals)
# target_link_libraries(TestOnsetSeg PRIVATE TestSignals)
# target_link_libraries(TestEnvelopeSeg PRIVATE TestSignals)
# target_link_libraries(TestEnvelopeGate PRIVATE TestSignals)
# target_link_libraries(TestTransientSlice PRIVATE TestSignals)

include(CTest)
include(Catch)

catch_discover_tests(TestFluidTensor WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")

catch_discover_tests(TestFluidTensorDeath
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
PROPERTIES WILL_FAIL true
)
# catch_discover_tests(TestFluidTensorDeath
# WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
# PROPERTIES WILL_FAIL true
# )

catch_discover_tests(TestFluidTensorView WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
catch_discover_tests(TestFluidTensorSupport WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
catch_discover_tests(TestFluidDataSet WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestFluidTensorView WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestFluidTensorSupport WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestFluidDataSet WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")

catch_discover_tests(TestNoveltySeg WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
catch_discover_tests(TestOnsetSeg WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
catch_discover_tests(TestEnvelopeSeg WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
catch_discover_tests(TestEnvelopeGate WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
catch_discover_tests(TestTransientSlice WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestNoveltySeg WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestOnsetSeg WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestEnvelopeSeg WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestEnvelopeGate WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestTransientSlice WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")

catch_discover_tests(TestFluidSource WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
catch_discover_tests(TestFluidSink WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
catch_discover_tests(TestBufferedProcess WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestFluidSource WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestFluidSink WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestBufferedProcess WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")

catch_discover_tests(TestMLP WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
# catch_discover_tests(TestMLP WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")

add_compile_tests("FluidTensor Compilation Tests" data/compile_tests/TestFluidTensor_Compile.cpp)
# add_compile_tests("FluidTensor Compilation Tests" data/compile_tests/TestFluidTensor_Compile.cpp)
Loading