kindred/solver
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

systemSolver->runBasicKinematic();

Browse Source
This commit is contained in:
Aik-Siong Koh
2023-06-11 07:15:20 -06:00
parent d848450907
commit 3b08cd72df
182 changed files with 2789 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
MbDCode/GESpMatFullPvPosIC.cpp
View File

@@ -2,8 +2,7 @@
#include <cassert>
#include "GESpMatFullPvPosIC.h"
//#include "FullColumn.h"
//#include "SparseMatrix.h"
#include "SingularMatrixError.h"
#include "PosICNewtonRaphson.h"
using namespace MbD;
@@ -12,7 +11,7 @@ void MbD::GESpMatFullPvPosIC::preSolvewithsaveOriginal(SpMatDsptr spMat, FColDsp
{
GESpMatFullPv::preSolvewithsaveOriginal(spMat, fullCol, saveOriginal);
if (system == nullptr) {
pivotRowLimits = std::make_shared<std::vector<size_t>>();
pivotRowLimits = std::make_shared<std::vector<int>>();
}
else {
pivotRowLimits = system->pivotRowLimits;
@@ -20,27 +19,76 @@ void MbD::GESpMatFullPvPosIC::preSolvewithsaveOriginal(SpMatDsptr spMat, FColDsp
pivotRowLimit = -1;
}
void MbD::GESpMatFullPvPosIC::doPivoting(size_t p)
void MbD::GESpMatFullPvPosIC::doPivoting(int p)
{
//"Used by Gauss Elimination only."
//"Swap rows but keep columns in place."
//"The elements below the diagonal are removed column by column."
assert(false);
auto max = 0.0;
auto pivotRow = p;
auto pivotCol = p;
for (size_t j = p; j < n; j++)
for (int j = p; j < n; j++)
{
rowPositionsOfNonZerosInColumns->at(colOrder->at(j))->clear();
}
if (p > pivotRowLimit) {
if (p == pivotRowLimit) {
pivotRowLimit = *std::find_if(
pivotRowLimits->begin(), pivotRowLimits->end(),
[&](size_t limit) { return limit >= p; });
[&](int limit) { return limit > p; });
}
for (size_t i = p; i < pivotRowLimit; i++)
for (int i = p; i < pivotRowLimit; i++)
{
auto& rowi = matrixA->at(i);
for (auto const& kv : *rowi) {
rowPositionsOfNonZerosInColumns->at(kv.first)->push_back(i);
auto aij = kv.second;
auto mag = aij;
if (mag < 0.0) mag = -mag;
if (max < mag) {
max = mag;
pivotRow = i;
pivotCol = positionsOfOriginalCols->at(kv.first);
}
}
}
}
if (p != pivotRow) {
matrixA->swapRows(p, pivotRow);
rightHandSideB->swapRows(p, pivotRow);
rowOrder->swapRows(p, pivotRow);
}
if (p != pivotCol) {
colOrder->swapRows(p, pivotCol);
positionsOfOriginalCols->at(colOrder->at(p)) = p;
positionsOfOriginalCols->at(colOrder->at(pivotCol)) = pivotCol;
}
pivotValues->at(p) = max;
if (max < singularPivotTolerance) {
auto itr = std::find_if(
pivotRowLimits->begin(), pivotRowLimits->end(),
[&](int limit) { return limit > pivotRowLimit; });
if (itr == pivotRowLimits->end()) {
auto begin = rowOrder->begin() + p;
auto end = rowOrder->begin() + pivotRowLimit;
auto redundantEqnNos = std::make_shared<FullColumn<int>>(begin, end);
throw SingularMatrixError("", redundantEqnNos);
}
else {
pivotRowLimit = *itr;
}
return this->doPivoting(p);
}
auto jp = colOrder->at(p);
rowPositionsOfNonZerosInPivotColumn = rowPositionsOfNonZerosInColumns->at(jp);
for (int i = pivotRowLimit; i < m; i++)
{
auto& spRowi = matrixA->at(i);
if (spRowi->find(jp) != spRowi->end()) {
rowPositionsOfNonZerosInPivotColumn->push_back(i);
}
}
if (rowPositionsOfNonZerosInPivotColumn->front() == p) {
rowPositionsOfNonZerosInPivotColumn->erase(rowPositionsOfNonZerosInPivotColumn->begin());
}
markowitzPivotColCount = (int) rowPositionsOfNonZerosInPivotColumn->size();
}