Skip to content

Commit

Permalink
renamed function as override was not of virtual
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnAD committed Nov 21, 2023
1 parent 4c41bf9 commit 0597cb7
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 38 deletions.
2 changes: 1 addition & 1 deletion OndselSolver/DirectionCosineIecJec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void DirectionCosineIecJec::calcPostDynCorrectorIteration()
{
aAjOIe = frmI->aAjOe(axisI);
aAjOJe = frmJ->aAjOe(axisJ);
aAijIeJe = aAjOIe->dot(aAjOJe);
aAijIeJe = aAjOIe->fcDot(aAjOJe);
}

double MbD::DirectionCosineIecJec::value()
Expand Down
2 changes: 1 addition & 1 deletion OndselSolver/DirectionCosineIeqcJec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void DirectionCosineIeqcJec::calcPostDynCorrectorIteration()
auto& ppAjOIepEIipEI = ppAjOIepEIpEI->at(i);
for (int j = 0; j < 4; j++)
{
ppAijIeJepEIipEI->at(j) = ppAjOIepEIipEI->at(j)->dot(aAjOJe);
ppAijIeJepEIipEI->at(j) = ppAjOIepEIipEI->at(j)->fcDot(aAjOJe);
}
}
ppAijIeJepEIpEI->symLowerWithUpper();
Expand Down
4 changes: 2 additions & 2 deletions OndselSolver/DirectionCosineIeqcJeqc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void DirectionCosineIeqcJeqc::calcPostDynCorrectorIteration()
pAjOJepEJT = std::static_pointer_cast<EndFrameqc>(frmJ)->pAjOepET(axisJ);
for (int i = 0; i < 4; i++)
{
pAijIeJepEJ->at(i) = aAjOIe->dot(pAjOJepEJT->at(i));
pAijIeJepEJ->at(i) = aAjOIe->fcDot(pAjOJepEJT->at(i));
}
for (int i = 0; i < 4; i++)
{
Expand All @@ -61,7 +61,7 @@ void DirectionCosineIeqcJeqc::calcPostDynCorrectorIteration()
auto& ppAjOJepEJipEJ = ppAjOJepEJpEJ->at(i);
for (int j = 0; j < 4; j++)
{
ppAijIeJepEJipEJ->at(j) = aAjOIe->dot(ppAjOJepEJipEJ->at(j));
ppAijIeJepEJipEJ->at(j) = aAjOIe->fcDot(ppAjOJepEJipEJ->at(j));
}
}
ppAijIeJepEJpEJ->symLowerWithUpper();
Expand Down
6 changes: 3 additions & 3 deletions OndselSolver/DirectionCosineIeqctJeqc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void DirectionCosineIeqctJeqc::preVelIC()
{
Item::preVelIC();
auto pAjOIept = std::static_pointer_cast<EndFrameqct>(frmI)->pAjOept(axisI);
pAijIeJept = pAjOIept->dot(aAjOJe);
pAijIeJept = pAjOIept->fcDot(aAjOJe);
}

double DirectionCosineIeqctJeqc::pvaluept()
Expand All @@ -82,7 +82,7 @@ void DirectionCosineIeqctJeqc::preAccIC()
}
for (int i = 0; i < 4; i++)
{
ppAijIeJepEJpt->atiput(i, pAjOIept->dot(pAjOJepEJT->at(i)));
ppAijIeJepEJpt->atiput(i, pAjOIept->fcDot(pAjOJepEJT->at(i)));
}
ppAijIeJeptpt = ppAjOIeptpt->dot(aAjOJe);
ppAijIeJeptpt = ppAjOIeptpt->fcDot(aAjOJe);
}
2 changes: 1 addition & 1 deletion OndselSolver/DispCompIecJecIe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void MbD::DispCompIecJecIe::calc_value()
{
aAjOIe = frmI->aAjOe(axis);
rIeJeO = frmJ->rOeO->minusFullColumn(frmI->rOeO);
riIeJeIe = aAjOIe->dot(rIeJeO);
riIeJeIe = aAjOIe->fcDot(rIeJeO);
}

void MbD::DispCompIecJecIe::calcPostDynCorrectorIteration()
Expand Down
6 changes: 3 additions & 3 deletions OndselSolver/DispCompIecJecKeqc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ void DispCompIecJecKeqc::calcPostDynCorrectorIteration()
auto efrmKqc = std::static_pointer_cast<EndFrameqc>(efrmK);
aAjOKe = efrmKqc->aAjOe(axisK);
rIeJeO = frmJqc->rOeO->minusFullColumn(frmIqc->rOeO);
riIeJeKe = aAjOKe->dot(rIeJeO);
riIeJeKe = aAjOKe->fcDot(rIeJeO);
pAjOKepEKT = efrmKqc->pAjOepET(axisK);
ppAjOKepEKpEK = efrmKqc->ppAjOepEpE(axisK);
for (int i = 0; i < 4; i++)
{
priIeJeKepEK->at(i) = ((pAjOKepEKT->at(i))->dot(rIeJeO));
auto& ppAjOKepEKipEK = ppAjOKepEKpEK->at(i);
auto& ppriIeJeKepEKipEK = ppriIeJeKepEKpEK->at(i);
ppriIeJeKepEKipEK->at(i) = ((ppAjOKepEKipEK->at(i))->dot(rIeJeO));
ppriIeJeKepEKipEK->at(i) = ((ppAjOKepEKipEK->at(i))->fcDot(rIeJeO));
for (int j = i + 1; j < 4; j++)
{
auto ppriIeJeKepEKipEKj = (ppAjOKepEKipEK->at(i))->dot(rIeJeO);
auto ppriIeJeKepEKipEKj = (ppAjOKepEKipEK->at(i))->fcDot(rIeJeO);
ppriIeJeKepEKipEK->at(j) = ppriIeJeKepEKipEKj;
ppriIeJeKepEKpEK->at(j)->at(i) = ppriIeJeKepEKipEKj;
}
Expand Down
6 changes: 3 additions & 3 deletions OndselSolver/DispCompIeqcJecIe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ void MbD::DispCompIeqcJecIe::calc_ppvaluepEIpEI()
auto ppriIeJeIepEIipEI = ppriIeJeIepEIpEI->at(i);
for (int j = i; j < 4; j++)
{
auto term1 = ppAjOIepEIipEI->at(j)->dot(rIeJeO);
auto term1 = ppAjOIepEIipEI->at(j)->fcDot(rIeJeO);
auto mterm2 = pAjOIepEIT->at(i)->dot(mprIeJeOpEIT->at(j));
auto mterm3 = (i == j) ? mterm2 : pAjOIepEIT->at(j)->dot(mprIeJeOpEIT->at(i));
auto mterm4 = aAjOIe->dot(mpprIeJeOpEIipEI->at(j));
auto mterm4 = aAjOIe->fcDot(mpprIeJeOpEIipEI->at(j));
ppriIeJeIepEIipEI->atiput(j, term1 - mterm2 - mterm3 - mterm4);
}
}
Expand All @@ -60,7 +60,7 @@ void MbD::DispCompIeqcJecIe::calc_pvaluepEI()
auto mprIeJeOpEIT = frmIeqc->prOeOpE->transpose();
for (int i = 0; i < 4; i++)
{
priIeJeIepEI->atiput(i, pAjOIepEIT->at(i)->dot(rIeJeO) - aAjOIe->dot(mprIeJeOpEIT->at(i)));
priIeJeIepEI->atiput(i, pAjOIepEIT->at(i)->dot(rIeJeO) - aAjOIe->fcDot(mprIeJeOpEIT->at(i)));
}
}

Expand Down
6 changes: 3 additions & 3 deletions OndselSolver/DispCompIeqcJecKeqc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void DispCompIeqcJecKeqc::calcPostDynCorrectorIteration()
}
for (int i = 0; i < 4; i++)
{
priIeJeKepEI->at(i) = 0.0 - (aAjOKe->dot(mprIeJeOpEIT->at(i)));
priIeJeKepEI->at(i) = 0.0 - (aAjOKe->fcDot(mprIeJeOpEIT->at(i)));
}
for (int i = 0; i < 3; i++)
{
Expand All @@ -55,10 +55,10 @@ void DispCompIeqcJecKeqc::calcPostDynCorrectorIteration()
{
auto& mpprIeJeOpEIipEI = mpprIeJeOpEIpEI->at(i);
auto& ppriIeJeKepEIipEI = ppriIeJeKepEIpEI->at(i);
ppriIeJeKepEIipEI->at(i) = 0.0 - (aAjOKe->dot(mpprIeJeOpEIipEI->at(i)));
ppriIeJeKepEIipEI->at(i) = 0.0 - (aAjOKe->fcDot(mpprIeJeOpEIipEI->at(i)));
for (int j = 0; j < 4; j++)
{
auto ppriIeJeKepEIipEIj = 0.0 - (aAjOKe->dot(mpprIeJeOpEIipEI->at(j)));
auto ppriIeJeKepEIipEIj = 0.0 - (aAjOKe->fcDot(mpprIeJeOpEIipEI->at(j)));
ppriIeJeKepEIipEI->at(j) = ppriIeJeKepEIipEIj;
ppriIeJeKepEIpEI->at(j)->at(i) = ppriIeJeKepEIipEIj;
}
Expand Down
4 changes: 2 additions & 2 deletions OndselSolver/DispCompIeqcJeqcIe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void MbD::DispCompIeqcJeqcIe::calc_ppvaluepEJpEJ()
auto ppriIeJeIepEJipEJ = ppriIeJeIepEJpEJ->at(i);
for (int j = i; j < 4; j++)
{
auto term1 = aAjOIe->dot(pprIeJeOpEJipEJ->at(j));
auto term1 = aAjOIe->fcDot(pprIeJeOpEJipEJ->at(j));
ppriIeJeIepEJipEJ->atiput(j, term1);
}
}
Expand All @@ -54,7 +54,7 @@ void MbD::DispCompIeqcJeqcIe::calc_pvaluepEJ()
auto prIeJeOpEJT = frmJeqc->prOeOpE->transpose();
for (int i = 0; i < 4; i++)
{
priIeJeIepEJ->atiput(i, aAjOIe->dot(prIeJeOpEJT->at(i)));
priIeJeIepEJ->atiput(i, aAjOIe->fcDot(prIeJeOpEJT->at(i)));
}
}

Expand Down
6 changes: 3 additions & 3 deletions OndselSolver/DispCompIeqcJeqcKeqc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void DispCompIeqcJeqcKeqc::calcPostDynCorrectorIteration()
}
for (int i = 0; i < 4; i++)
{
priIeJeKepEJ->atiput(i, aAjOKe->dot(prIeJeOpEJT->at(i)));
priIeJeKepEJ->atiput(i, aAjOKe->fcDot(prIeJeOpEJT->at(i)));
}
for (int i = 0; i < 3; i++)
{
Expand All @@ -55,10 +55,10 @@ void DispCompIeqcJeqcKeqc::calcPostDynCorrectorIteration()
{
auto& pprIeJeOpEJipEJ = pprIeJeOpEJpEJ->at(i);
auto& ppriIeJeKepEJipEJ = ppriIeJeKepEJpEJ->at(i);
ppriIeJeKepEJipEJ->atiput(i, aAjOKe->dot(pprIeJeOpEJipEJ->at(i)));
ppriIeJeKepEJipEJ->atiput(i, aAjOKe->fcDot(pprIeJeOpEJipEJ->at(i)));
for (int j = 0; j < 4; j++)
{
auto ppriIeJeKepEJipEJj = (aAjOKe->dot(pprIeJeOpEJipEJ->at(j)));
auto ppriIeJeKepEJipEJj = (aAjOKe->fcDot(pprIeJeOpEJipEJ->at(j)));
ppriIeJeKepEJipEJ->atiput(j, ppriIeJeKepEJipEJj);
ppriIeJeKepEJpEJ->atijput(j, i, ppriIeJeKepEJipEJj);
}
Expand Down
8 changes: 4 additions & 4 deletions OndselSolver/DispCompIeqcJeqcKeqct.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void DispCompIeqcJeqcKeqct::preVelIC()
{
Item::preVelIC();
auto pAjOKept = std::static_pointer_cast<EndFrameqct>(efrmK)->pAjOept(axisK);
priIeJeKept = pAjOKept->dot(rIeJeO);
priIeJeKept = pAjOKept->fcDot(rIeJeO);
}

double DispCompIeqcJeqcKeqct::pvaluept()
Expand Down Expand Up @@ -100,9 +100,9 @@ void DispCompIeqcJeqcKeqct::preAccIC()
}
for (int i = 0; i < 4; i++)
{
ppriIeJeKepEIpt->atiput(i, pAjOKept->dot(prIeJeOpEIT->at(i)));
ppriIeJeKepEJpt->atiput(i, pAjOKept->dot(prIeJeOpEJT->at(i)));
ppriIeJeKepEIpt->atiput(i, pAjOKept->fcDot(prIeJeOpEIT->at(i)));
ppriIeJeKepEJpt->atiput(i, pAjOKept->fcDot(prIeJeOpEJT->at(i)));
ppriIeJeKepEKpt->atiput(i, ppAjOKepEKTpt->at(i)->dot(rIeJeO));
}
ppriIeJeKeptpt = ppAjOKeptpt->dot(rIeJeO);
ppriIeJeKeptpt = ppAjOKeptpt->fcDot(rIeJeO);
}
11 changes: 7 additions & 4 deletions OndselSolver/DispCompIeqctJeqcIe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ void MbD::DispCompIeqctJeqcIe::calc_ppvaluepEIpt()
auto pAjOIepEITi = pAjOIepEIT->at(i);
auto mprIeJeOpEITi = mprIeJeOpEIT->at(i);
auto mpprIeJeOpEITpti = mpprIeJeOpEITpt->at(i);
auto ppriIeJeIepEIpti = ppAjOIepEITpti->dot(rIeJeO) - pAjOIepEITi->dot(mprIeJeOpt) - pAjOIept->dot(mprIeJeOpEITi) - aAjOIe->dot(mpprIeJeOpEITpti);
auto ppriIeJeIepEIpti = ppAjOIepEITpti->dot(rIeJeO) - pAjOIepEITi->dot(mprIeJeOpt) -
pAjOIept->fcDot(mprIeJeOpEITi) -
aAjOIe->fcDot(mpprIeJeOpEITpti);
ppriIeJeIepEIpt->atiput(i, ppriIeJeIepEIpti);
}
}
Expand All @@ -46,7 +48,7 @@ void MbD::DispCompIeqctJeqcIe::calc_ppvaluepEJpt()
auto prIeJeOpEJT = frmJeqct->prOeOpE->transpose();
for (int i = 0; i < 4; i++)
{
ppriIeJeIepEJpt->atiput(i, pAjOIept->dot(prIeJeOpEJT->at(i)));
ppriIeJeIepEJpt->atiput(i, pAjOIept->fcDot(prIeJeOpEJT->at(i)));
}
}

Expand All @@ -57,7 +59,8 @@ void MbD::DispCompIeqctJeqcIe::calc_ppvalueptpt()
auto ppAjOIeptpt = frmIeqct->ppAjOeptpt(axis);
auto mprIeJeOpt = frmIeqct->prOeOpt;
auto mpprIeJeOptpt = frmIeqct->pprOeOptpt;
ppriIeJeIeptpt = ppAjOIeptpt->dot(rIeJeO) - pAjOIept->dot(mprIeJeOpt) - pAjOIept->dot(mprIeJeOpt) - aAjOIe->dot(mpprIeJeOptpt);
ppriIeJeIeptpt = ppAjOIeptpt->fcDot(rIeJeO) - pAjOIept->fcDot(mprIeJeOpt) - pAjOIept->fcDot(mprIeJeOpt) -
aAjOIe->fcDot(mpprIeJeOptpt);
}

void MbD::DispCompIeqctJeqcIe::calc_ppvaluepXIpt()
Expand Down Expand Up @@ -85,7 +88,7 @@ void MbD::DispCompIeqctJeqcIe::calc_pvaluept()
auto frmIeqct = std::static_pointer_cast<EndFrameqct>(frmI);
auto pAjOIept = frmIeqct->pAjOept(axis);
auto mprIeJeOpt = frmIeqct->prOeOpt;
priIeJeIept = pAjOIept->dot(rIeJeO) - aAjOIe->dot(mprIeJeOpt);
priIeJeIept = pAjOIept->fcDot(rIeJeO) - aAjOIe->fcDot(mprIeJeOpt);
}

void MbD::DispCompIeqctJeqcIe::calcPostDynCorrectorIteration()
Expand Down
6 changes: 3 additions & 3 deletions OndselSolver/DispCompIeqctJeqcKeqct.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void DispCompIeqctJeqcKeqct::preVelIC()
{
DispCompIeqcJeqcKeqct::preVelIC();
auto& mprIeJeOpt = std::static_pointer_cast<EndFrameqct>(frmI)->prOeOpt;
priIeJeKept -= aAjOKe->dot(mprIeJeOpt);
priIeJeKept -= aAjOKe->fcDot(mprIeJeOpt);
}

void DispCompIeqctJeqcKeqct::preAccIC()
Expand All @@ -36,8 +36,8 @@ void DispCompIeqctJeqcKeqct::preAccIC()
auto& mpprIeJeOptpt = efrmIqct->pprOeOptpt;
for (int i = 0; i < 4; i++)
{
ppriIeJeKepEIpt->atiminusNumber(i, aAjOKe->dot(mpprIeJeOpEITpt->at(i)));
ppriIeJeKepEIpt->atiminusNumber(i, aAjOKe->fcDot(mpprIeJeOpEITpt->at(i)));
ppriIeJeKepEKpt->atiminusNumber(i, pAjOKepEKT->at(i)->dot(mprIeJeOpt));
}
ppriIeJeKeptpt += -(2.0 * pAjOKept->dot(mprIeJeOpt)) - aAjOKe->dot(mpprIeJeOptpt);
ppriIeJeKeptpt += -(2.0 * pAjOKept->fcDot(mprIeJeOpt)) - aAjOKe->fcDot(mpprIeJeOptpt);
}
2 changes: 1 addition & 1 deletion OndselSolver/DistIeqcJec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void MbD::DistIeqcJec::calcPrivate()
for (int j = 0; j < 4; j++)
{
auto element = mprIeJeOpEIiT->dot(mprIeJeOpEIT->at(j))
- mpprIeJeOpEIipEI->at(j)->dot(rIeJeO) - prIeJepEIi * prIeJepEI->at(j);
- mpprIeJeOpEIipEI->at(j)->fcDot(rIeJeO) - prIeJepEIi * prIeJepEI->at(j);
pprIeJepEIipEI->atiput(j, element / rIeJe);
}
}
Expand Down
2 changes: 1 addition & 1 deletion OndselSolver/DistIeqcJeqc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void MbD::DistIeqcJeqc::calcPrivate()
for (int j = 0; j < 4; j++)
{
auto element = prIeJeOpEJiT->dot(prIeJeOpEJT->at(j))
+ pprIeJeOpEJipEJ->at(j)->dot(rIeJeO) - prIeJepEJi * prIeJepEJ->at(j);
+ pprIeJeOpEJipEJ->at(j)->fcDot(rIeJeO) - prIeJepEJi * prIeJepEJ->at(j);
pprIeJepEJipEJ->atiput(j, element / rIeJe);
}
}
Expand Down
4 changes: 2 additions & 2 deletions OndselSolver/FullColumn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ namespace MbD {
template<typename T>
T FullColumn<T>::transposeTimesFullColumn(const FColsptr<T> fullCol)
{
return this->dot(fullCol);
return this->fcDot(fullCol);
}
template<typename T>
void FullColumn<T>::equalSelfPlusFullColumntimes(FColsptr<T> fullCol, T factor)
Expand Down Expand Up @@ -170,7 +170,7 @@ namespace MbD {
template class FullColumn<double>;
template class FullColumn<int>;
template<typename T>
double FullColumn<T>::dot(std::shared_ptr<FullVector<T>> vec)
double FullColumn<T>::fcDot(std::shared_ptr<FullVector<T>> vec)
{
int n = (int)this->size();
double answer = 0.0;
Expand Down
2 changes: 1 addition & 1 deletion OndselSolver/FullColumn.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace MbD {
FColsptr<T> cross(FColsptr<T> fullCol);
FColsptr<T> simplified();
std::shared_ptr<FullColumn<T>> cloneFcSptr();
double dot(std::shared_ptr<FullVector<T>> vec);
double fcDot(std::shared_ptr<FullVector<T>> vec);
std::shared_ptr<FullVector<T>> dot(std::shared_ptr<std::vector<std::shared_ptr<FullColumn<T>>>> vecvec);

std::ostream& printOn(std::ostream& s) const override;
Expand Down

0 comments on commit 0597cb7

Please sign in to comment.