Skip to content
Snippets Groups Projects
Commit 2bf4cb81 authored by Andre Offringa's avatar Andre Offringa
Browse files

Merge branch 'revert-mr-1145' into 'master'

Revert "Merge branch 'RAP-299-solver_base' into 'master'"

See merge request RD/DP3!1239
parents d87a9d33 eb5f7225
No related branches found
No related tags found
No related merge requests found
......@@ -7,6 +7,7 @@
#include <iostream>
#include <numeric>
#include <aocommon/matrix2x2.h>
#include <aocommon/staticfor.h>
#include <aocommon/xt/span.h>
......@@ -14,8 +15,6 @@
#include <xtensor/xview.hpp>
#include "common/MatrixComplexDouble2x2.h"
namespace {
template <typename T>
bool IsFinite(const std::complex<T>& val) {
......@@ -255,11 +254,10 @@ bool SolverBase::AssignSolutions(std::vector<std::vector<DComplex>>& solutions,
}
} else {
assert(n_solution_pols == 4);
const aocommon::MatrixComplexDouble2x2 s(&solutions[chBlock][i]);
aocommon::MatrixComplexDouble2x2 sInv(s);
const aocommon::MC2x2 s(&solutions[chBlock][i]);
aocommon::MC2x2 sInv(s);
if (sInv.Invert()) {
aocommon::MatrixComplexDouble2x2 ns(
&new_solutions_view(chBlock, i / 4, 0));
aocommon::MC2x2 ns(&new_solutions_view(chBlock, i / 4, 0));
ns -= s;
ns *= sInv;
const double sumabs = std::abs(ns[0]) + std::abs(ns[1]) +
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment