Skip to content

[FEATURE] enhance input display by sorting inputs before output #35

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

Merged
SamGave07 merged 5 commits into from
Mar 9, 2025
Merged

[FEATURE] enhance input display by sorting inputs before output #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5d2856
[FIX] Stack overflow in inputcomponent
maelemiel Mar 8, 2025
b332093
[FIX] input output test with removing one simulate because compute do…
maelemiel Mar 8, 2025
0b2059e
[FEATURE] add signal handling and improve user input processing in Sh…
maelemiel Mar 9, 2025
8b22c96
Merge branch 'main' of github.com:thinkboosted/NTS_clone into dev
maelemiel Mar 9, 2025
6f8b454
[FEATURE] enhance input display by sorting inputs before output
maelemiel Mar 9, 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
1 change: 1 addition & 0 deletions include/Circuit.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <vector>

#include <iostream>
#include <map>
#include "./specialComponents/Input.hpp"

namespace nts
Expand Down
20 changes: 13 additions & 7 deletions src/Circuit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "../include/Circuit.hpp"
#include "../include/specialComponents/Input.hpp"
#include "../include/IComponent.hpp"
#include <algorithm>

nts::Circuit::Circuit()
: _factory(nts::Factory()), _tick(0)
Expand Down Expand Up @@ -53,42 +54,47 @@ void nts::Circuit::displayComponentState(const std::string& name, nts::Tristate

void nts::Circuit::displayInputs() const
{
std::cout << "input(s):" << std::endl;
std::map<std::string, nts::Tristate> sortedInputs;

for (const auto &component : _components)
{
//check if it is true/false or if it is an actual input/clock
if (isTrueFalseComponent(*component.second))
continue;

if (component.first == "true" || component.first == "false" || component.first == "undefined")
continue;
auto clock = dynamic_cast<nts::ClockComponent *>(component.second.get());
if (clock != nullptr)
{
displayComponentState(clock->getName(), clock->getState());
sortedInputs[clock->getName()] = clock->getState();
continue;
}
auto input = dynamic_cast<nts::InputComponent *>(component.second.get());
if (input != nullptr)
{
displayComponentState(input->getName(), input->getState());
sortedInputs[input->getName()] = input->getState();
continue;
}
auto trueComponent = dynamic_cast<nts::TrueComponent *>(component.second.get());
if (trueComponent != nullptr)
{
displayComponentState(trueComponent->getName(), trueComponent->getState());
sortedInputs[trueComponent->getName()] = trueComponent->getState();
continue;
}
auto falseComponent = dynamic_cast<nts::FalseComponent *>(component.second.get());
if (falseComponent != nullptr)
{
displayComponentState(falseComponent->getName(), falseComponent->getState());
sortedInputs[falseComponent->getName()] = falseComponent->getState();
}
}
for (const auto &[name, state] : sortedInputs) {
displayComponentState(name, state);
}
}

void nts::Circuit::display() const
{
std::cout << "tick: " << _tick << std::endl;
std::cout << "input(s):" << std::endl;
displayInputs();
std::cout << "output(s):" << std::endl;
for (const auto &output : _outputs) {
Expand Down
Loading