Sequential processing fixes

agui2/src/MainWindow.cpp

@@ -57,7 +57,12 @@ void MainWindow::on_RunBtn_clicked()
 {
     std::shared_ptr<abstraction::OperationAbstraction> result;
     try {
+#if 0
+        this->outputBox->getModelBox()->clearResultRecursive();
+        result = this->outputBox->getModelBox()->run();
+#else
         result = ParallelExecutor::getInstance()->execute(dynamic_cast<OutputModelBox*>(this->outputBox->getModelBox()));
+#endif
     }
     catch (const exception::CommonException& e) {
         this->displayError(QString::fromStdString(e.getCause()));

agui2/src/Models/AlgorithmModelBox.cpp

@@ -10,18 +10,17 @@ AlgorithmModelBox::AlgorithmModelBox(Algorithm* algorithm)
     : ModelBox(ModelType::Algorithm, algorithm->getInputCount())
     , algorithm(algorithm) {}
-std::shared_ptr<abstraction::OperationAbstraction> AlgorithmModelBox::run() {
+std::shared_ptr<abstraction::OperationAbstraction> AlgorithmModelBox::runInternal() {
     std::vector<std::shared_ptr<abstraction::OperationAbstraction>> params;
-    for (const auto* input: this->inputs)
+    for (auto* input: this->inputs)
     {
         if (!input)
             return nullptr;
-        params.push_back(input->getResult());
+        params.push_back(input->run());
         if (!params.back())
             return nullptr;
     }
-    this->result = this->algorithm->execute(params);
-    return this->result;
+    return this->algorithm->execute(params);
 }
 std::string AlgorithmModelBox::getName() const {

agui2/src/Models/AlgorithmModelBox.hpp

@@ -9,7 +9,8 @@ public:
     std::string getName() const override;
     Algorithm* getAlgorithm() const { return this->algorithm; }
-    std::shared_ptr<abstraction::OperationAbstraction> run() override;
+protected:
+    std::shared_ptr<abstraction::OperationAbstraction> runInternal() override;
 private:
     Algorithm* algorithm;

agui2/src/Models/InputModelBox.cpp

@@ -4,7 +4,7 @@ InputModelBox::InputModelBox()
     : ModelBox(ModelType::Input, 0)
 {}
-std::shared_ptr<abstraction::OperationAbstraction> InputModelBox::run() {
+std::shared_ptr<abstraction::OperationAbstraction> InputModelBox::runInternal() {
     return this->result;
 }

agui2/src/Models/InputModelBox.hpp

@@ -6,7 +6,9 @@ class InputModelBox : public ModelBox {
 public:
     explicit InputModelBox();
-    std::shared_ptr<abstraction::OperationAbstraction> run() override;
+    void clearResultRecursive() override {}
+
+    std::shared_ptr<abstraction::OperationAbstraction> runInternal() override;
     std::string getName() const override;

agui2/src/Models/ModelBox.cpp

@@ -34,3 +34,18 @@ void ModelBox::removeOutput(ModelBox* model, uint8_t slot) {
     Q_ASSERT(this->canHaveOutput());
     this->outputs.erase({model, slot});
 }
+
+std::shared_ptr<abstraction::OperationAbstraction> ModelBox::run() {
+    if (!this->result)
+        this->result = this->runInternal();
+
+    return this->result;
+}
+
+void ModelBox::clearResultRecursive() {
+    this->result.reset();
+    for (auto* input: this->inputs) {
+        input->clearResultRecursive();
+    }
+
+}

agui2/src/Models/ModelBox.hpp

@@ -34,9 +34,13 @@ public:
     virtual bool canHaveOutput() const { return true; }
     std::shared_ptr<abstraction::OperationAbstraction> getResult() const { return this->result; }
-    virtual std::shared_ptr<abstraction::OperationAbstraction> run() = 0;
+    virtual void clearResultRecursive();
+
+    std::shared_ptr<abstraction::OperationAbstraction> run();
 protected:
+    virtual std::shared_ptr<abstraction::OperationAbstraction> runInternal() = 0;
+
     ModelType type;
     uint8_t maxInputCount = 0;

agui2/src/Models/OutputModelBox.cpp

@@ -6,12 +6,11 @@ OutputModelBox::OutputModelBox()
     : ModelBox(ModelType::Output, 1)
 {}
-std::shared_ptr<abstraction::OperationAbstraction> OutputModelBox::run() {
+std::shared_ptr<abstraction::OperationAbstraction> OutputModelBox::runInternal() {
     assert(this->inputs.size() == 1);
     if (!this->inputs[0])
         return nullptr;
-    this->result = inputs[0]->getResult();
-    return this->result;
+    return inputs[0]->run();
 }
 std::string OutputModelBox::getName() const {

agui2/src/Models/OutputModelBox.hpp

@@ -9,7 +9,7 @@ public:
     bool canHaveOutput() const override { return false; }
-    std::shared_ptr<abstraction::OperationAbstraction> run() override;
+    std::shared_ptr<abstraction::OperationAbstraction> runInternal() override;
 };