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

WIP: fixes mac errors and warnings (#34)

Browse Source 
* fixes mac errors and warnings; check on TODO items

* renamed function as override was not of virtual

* removed another using

* experimental adjustment

* move fcDot to public

* renaming things
This commit is contained in:
John Dupuy
2023-11-21 09:16:25 -06:00
committed by GitHub
parent 6f4fca7efb
commit 3952f45945
41 changed files with 137 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OndselSolver/FullColumn.cpp
View File

@@ -126,7 +126,7 @@ namespace MbD {
template<typename T>
T FullColumn<T>::transposeTimesFullColumn(const FColsptr<T> fullCol)
{
return this->dot(fullCol);
return this->dotVec(fullCol);
}
template<typename T>
void FullColumn<T>::equalSelfPlusFullColumntimes(FColsptr<T> fullCol, T factor)
@@ -170,16 +170,6 @@ namespace MbD {
template class FullColumn<double>;
template class FullColumn<int>;
template<typename T>
double FullColumn<T>::dot(std::shared_ptr<FullVector<T>> vec)
{
int n = (int)this->size();
double answer = 0.0;
for (int i = 0; i < n; i++) {
answer += this->at(i) * vec->at(i);
}
return answer;
}
template<typename T>
std::shared_ptr<FullVector<T>> FullColumn<T>::dot(std::shared_ptr<std::vector<std::shared_ptr<FullColumn<T>>>> vecvec)
{
int ncol = (int)this->size();
@@ -195,10 +185,4 @@ namespace MbD {
}
return answer;
}
template<typename T>
std::shared_ptr<FullColumn<T>> FullColumn<T>::clonesptr()
{
return std::make_shared<FullColumn<T>>(*this);
}
}