diff --git a/src/Computation.cxx b/src/Computation.cxx index 7896092..dc05e57 100644 --- a/src/Computation.cxx +++ b/src/Computation.cxx @@ -375,36 +375,6 @@ std::vector Computation::computeAugmentedPerturbationSaturatedAndDissipa } } -//TODO test if it works in the correct way -std::vector Computation::computeAugmentedPerturbationEnhanced1(double timeStep, bool saturation, const std::vector& saturationsVector){ - if(saturation){ - if (saturationsVector.size() ) { - if (saturationsVector.size() == InputAugmentedArma.n_elem) { - arma::Col outputArma = pseudoInverseAugmentedArma * dissipationModel->dissipate(InputAugmentedArma, timeStep); - for(uint i = 0;i outputArma = pseudoInverseAugmentedArma * dissipationModel->dissipate(InputAugmentedArma, timeStep); - for(uint i = 0;i outputArma = pseudoInverseAugmentedArma * dissipationModel->dissipate(InputAugmentedArma, timeStep); - outputAugmented = armaColumnToVector(outputArma); - return outputAugmented; - } -} - //TODO test if it works in the correct way std::vector Computation::computeAugmentedPerturbationEnhanced2(double timeStep, bool saturation, const std::vector& saturationsVector,const std::vector& qVector){ if (saturation) { diff --git a/src/Computation.h b/src/Computation.h index 2660d18..701ba5f 100644 --- a/src/Computation.h +++ b/src/Computation.h @@ -69,7 +69,6 @@ class Computation{ std::vector computeAugmentedPerturbationDissipatedAfterCompute(double timeStep); //taking into account dissipation after every iteration(Dissipation model), dissipation after the computation of the perturbated value std::vector computeAugmentedPerturbationDissipatedBeforeCompute(double timeStep); //taking into account dissipation after every iteration (Dissipation model), dissipation before the computation of the perturbated value std::vector computeAugmentedPerturbationSaturatedAndDissipatedBeforeCompute(double timeStep,const std::vector& saturationsVector = std::vector()); //taking into account saturation(hyperbolic tangent and scaling) and dissipation after every iteration - std::vector computeAugmentedPerturbationEnhanced1(double timeStep, bool saturation = true, const std::vector& saturationsVector = std::vector()); //taking into account saturation(hyperbolic tangent and scaling) and dissipation after every iteration std::vector computeAugmentedPerturbationEnhanced2(double timeStep, bool saturation = true, const std::vector& saturationsVector = std::vector(),const std::vector& qVector = std::vector()); //taking into account saturation(hyperbolic tangent and scaling), dissipation and conservation after every iteration std::vector computeAugmentedPerturbationEnhanced3(double timeStep, bool saturation = true, const std::vector& saturationsVector = std::vector(),const std::vector& qVector = std::vector(), std::function propagationScaleFunction = [](double time)-> double{return 1.0;}); //taking into account scaling std::vector computeAugmentedPerturbationEnhanced4(double timeStep, bool saturation = true, const std::vector& saturationsVector = std::vector(),const std::vector& qVector = std::vector()); //all the models diff --git a/src/ComputationOptimized.cxx b/src/ComputationOptimized.cxx index 9166acc..a515ef4 100644 --- a/src/ComputationOptimized.cxx +++ b/src/ComputationOptimized.cxx @@ -315,35 +315,6 @@ std::vector ComputationOptimized::computeAugmentedPerturbationSaturatedA } } -//TODO test if it works in the correct way -std::vector ComputationOptimized::computeAugmentedPerturbationEnhanced1(double timeStep, bool saturation, const std::vector& saturationsVector){ - if(saturation){ - if (saturationsVector.size() ) { - if (saturationsVector.size() == InputAugmentedArma.n_elem) { - arma::Col outputArma = pseudoInverseAugmentedArma * dissipationModel->dissipate(InputAugmentedArma, timeStep); - for(uint i = 0;i outputArma = pseudoInverseAugmentedArma * dissipationModel->dissipate(InputAugmentedArma, timeStep); - for(uint i = 0;i outputArma = pseudoInverseAugmentedArma * dissipationModel->dissipate(InputAugmentedArma, timeStep); - outputAugmented = armaColumnToVector(outputArma); - return outputAugmented; - } -} //TODO test if it works in the correct way std::vector ComputationOptimized::computeAugmentedPerturbationEnhanced2(double timeStep, bool saturation, const std::vector& saturationsVector,const std::vector& qVector){ diff --git a/src/ComputationOptimized.h b/src/ComputationOptimized.h index 3357a1f..063a3aa 100644 --- a/src/ComputationOptimized.h +++ b/src/ComputationOptimized.h @@ -66,7 +66,6 @@ class ComputationOptimized{ std::vector computeAugmentedPerturbationDissipatedAfterCompute(double timeStep); //taking into account dissipation after every iteration(Dissipation model), dissipation after the ComputationOptimized of the perturbated value std::vector computeAugmentedPerturbationDissipatedBeforeCompute(double timeStep); //taking into account dissipation after every iteration (Dissipation model), dissipation before the ComputationOptimized of the perturbated value std::vector computeAugmentedPerturbationSaturatedAndDissipatedBeforeCompute(double timeStep,const std::vector& saturationsVector = std::vector()); //taking into account saturation(hyperbolic tangent and scaling) and dissipation after every iteration - std::vector computeAugmentedPerturbationEnhanced1(double timeStep, bool saturation = true, const std::vector& saturationsVector = std::vector()); //taking into account saturation(hyperbolic tangent and scaling) and dissipation after every iteration std::vector computeAugmentedPerturbationEnhanced2(double timeStep, bool saturation = true, const std::vector& saturationsVector = std::vector(),const std::vector& qVector = std::vector()); //taking into account saturation(hyperbolic tangent and scaling), dissipation and conservation after every iteration std::pair getMapVirtualOutputsToCellInputs(); //TODO void updateInput(const std::vector& newInp = std::vector(), bool augmented = false);