Skip to content
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

Jump to bottom

Update to latest graph-prototype #141

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Update to latest graph-prototype #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set(ENABLE_TESTING OFF)
FetchContent_Declare(
graph-prototype
GIT_REPOSITORY https://github.com/fair-acc/graph-prototype.git
GIT_TAG ed9738d809d4f89ddbbee49fd9a3bbd87c27bfab # main as of 2024-02-20
GIT_TAG 7f22e217e88ef54fe45ece84f804f6de8b7ff989 # main as of 2024-02-22
)

FetchContent_Declare(
Expand Down
12 changes: 6 additions & 6 deletions blocklib/picoscope/test/qa_Picoscope4000a.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ testStreamingBasics() {
expect(nothrow([&ps] { ps.start(); }));

scheduler::Simple<scheduler::ExecutionPolicy::multiThreaded> sched{ std::move(flowGraph) };
sched.init();
sched.start();
expect(sched.changeStateTo(lifecycle::State::INITIALISED).has_value());
expect(sched.changeStateTo(lifecycle::State::RUNNING).has_value());
std::this_thread::sleep_for(kDuration);
sched.stop();
expect(sched.changeStateTo(lifecycle::State::REQUESTED_STOP).has_value());

const auto measuredRate = static_cast<double>(sink.samples_seen) / duration<double>(kDuration).count();
fmt::println("Produced in worker: {}", ps.producedWorker());
Expand Down Expand Up @@ -186,10 +186,10 @@ const boost::ut::suite Picoscope4000aTests = [] {
expect(eq(ConnectionResult::SUCCESS, flowGraph.connect<"analog_out", 0>(ps).to<"in">(sink0)));

scheduler::Simple<scheduler::ExecutionPolicy::multiThreaded> sched{ std::move(flowGraph) };
sched.init();
sched.start();
expect(sched.changeStateTo(lifecycle::State::INITIALISED).has_value());
expect(sched.changeStateTo(lifecycle::State::RUNNING).has_value());
std::this_thread::sleep_for(std::chrono::seconds(3));
sched.stop();
expect(sched.changeStateTo(lifecycle::State::REQUESTED_STOP).has_value());

expect(ge(sink0.samples_seen, std::size_t{ 2000 }));
expect(le(sink0.samples_seen, std::size_t{ 10000 }));
Expand Down