Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various compiler warnings #46

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OndselSolver/ASMTAnimationParameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ void MbD::ASMTAnimationParameters::parseASMT(std::vector<std::string>& lines)
{
//int nframe, icurrent, istart, iend, framesPerSecond;
//bool isForward;
int pos = (int)lines[0].find_first_not_of("\t");
auto pos = lines[0].find_first_not_of("\t");
auto leadingTabs = lines[0].substr(0, pos);
assert(lines[0] == (leadingTabs + "nframe"));
lines.erase(lines.begin());
Expand Down
14 changes: 7 additions & 7 deletions OndselSolver/ASMTAssembly.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -894,9 +894,9 @@ double MbD::ASMTAssembly::calcCharacteristicTime()

double MbD::ASMTAssembly::calcCharacteristicMass()
{
auto n = (int)parts->size();
auto n = parts->size();
double sumOfSquares = 0.0;
for (int i = 0; i < n; i++)
for (size_t i = 0; i < n; i++)
{
auto mass = parts->at(i)->principalMassMarker->mass;
sumOfSquares += mass * mass;
Expand All @@ -917,9 +917,9 @@ double MbD::ASMTAssembly::calcCharacteristicLength()
auto& mkrJ = markerMap->at(connector->markerJ);
lengths->push_back(mkrJ->rpmp()->length());
}
auto n = (int)lengths->size();
auto n = lengths->size();
double sumOfSquares = std::accumulate(lengths->begin(), lengths->end(), 0.0, [](double sum, double l) { return sum + l * l; });
auto unitLength = std::sqrt(sumOfSquares / std::max((int)n, 1));
auto unitLength = std::sqrt(sumOfSquares / std::max(n, size_t(1)));
if (unitLength <= 0) unitLength = 1.0;
return unitLength;
}
Expand Down Expand Up @@ -1054,7 +1054,7 @@ void MbD::ASMTAssembly::runKINEMATIC()
try {
mbdSystem->runKINEMATIC(mbdSystem);
}
catch (SimulationStoppingError ex) {
catch (const SimulationStoppingError& ex) {

}
}
Expand Down Expand Up @@ -1285,13 +1285,13 @@ void MbD::ASMTAssembly::storeOnTimeSeries(std::ofstream& os)
if (times->empty()) return;
os << "TimeSeries" << std::endl;
os << "Number\tInput\t";
for (int i = 1; i < (int)times->size(); i++)
for (size_t i = 1; i < times->size(); i++)
{
os << i << '\t';
}
os << std::endl;
os << "Time\tInput\t";
for (int i = 1; i < (int)times->size(); i++)
for (size_t i = 1; i < times->size(); i++)
{
os << times->at(i) << '\t';
}
Expand Down
2 changes: 1 addition & 1 deletion OndselSolver/ASMTItem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ void MbD::ASMTItem::storeOnLevelBool(std::ofstream& os, int level, bool value)
void MbD::ASMTItem::storeOnLevelArray(std::ofstream& os, int level, std::vector<double> array)
{
storeOnLevelTabs(os, level);
for (int i = 0; i < (int)array.size(); i++)
for (size_t i = 0; i < array.size(); i++)
{
os << array[i] << '\t';
}
Expand Down
12 changes: 6 additions & 6 deletions OndselSolver/ASMTItemIJ.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,37 +108,37 @@ void MbD::ASMTItemIJ::storeOnLevel(std::ofstream& os, int level)
void MbD::ASMTItemIJ::storeOnTimeSeries(std::ofstream& os)
{
os << "FXonI\t";
for (int i = 0; i < (int)fxs->size(); i++)
for (size_t i = 0; i < fxs->size(); i++)
{
os << fxs->at(i) << '\t';
}
os << std::endl;
os << "FYonI\t";
for (int i = 0; i < (int)fys->size(); i++)
for (size_t i = 0; i < fys->size(); i++)
{
os << fys->at(i) << '\t';
}
os << std::endl;
os << "FZonI\t";
for (int i = 0; i < (int)fzs->size(); i++)
for (size_t i = 0; i < fzs->size(); i++)
{
os << fzs->at(i) << '\t';
}
os << std::endl;
os << "TXonI\t";
for (int i = 0; i < (int)txs->size(); i++)
for (size_t i = 0; i < txs->size(); i++)
{
os << txs->at(i) << '\t';
}
os << std::endl;
os << "TYonI\t";
for (int i = 0; i < (int)tys->size(); i++)
for (size_t i = 0; i < tys->size(); i++)
{
os << tys->at(i) << '\t';
}
os << std::endl;
os << "TZonI\t";
for (int i = 0; i < (int)tzs->size(); i++)
for (size_t i = 0; i < tzs->size(); i++)
{
os << tzs->at(i) << '\t';
}
Expand Down
2 changes: 1 addition & 1 deletion OndselSolver/ASMTPrincipalMassMarker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ MbD::ASMTPrincipalMassMarker::ASMTPrincipalMassMarker()

void MbD::ASMTPrincipalMassMarker::parseASMT(std::vector<std::string>& lines)
{
int pos = (int)lines[0].find_first_not_of("\t");
auto pos = lines[0].find_first_not_of("\t");
auto leadingTabs = lines[0].substr(0, pos);
assert(lines[0] == (leadingTabs + "Name"));
lines.erase(lines.begin());
Expand Down
2 changes: 1 addition & 1 deletion OndselSolver/ASMTSimulationParameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ void MbD::ASMTSimulationParameters::parseASMT(std::vector<std::string>& lines)
{
//tstart, tend, hmin, hmax, hout, errorTol;

int pos = (int)lines[0].find_first_not_of("\t");
auto pos = lines[0].find_first_not_of("\t");
auto leadingTabs = lines[0].substr(0, pos);
assert(lines[0] == (leadingTabs + "tstart"));
lines.erase(lines.begin());
Expand Down
36 changes: 18 additions & 18 deletions OndselSolver/ASMTSpatialContainer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -603,109 +603,109 @@ void MbD::ASMTSpatialContainer::storeOnLevelRefSurfaces(std::ofstream& os, int l
void MbD::ASMTSpatialContainer::storeOnTimeSeries(std::ofstream& os)
{
os << "X\t";
for (int i = 0; i < (int)xs->size(); i++)
for (size_t i = 0; i < xs->size(); i++)
{
os << xs->at(i) << '\t';
}
os << std::endl;
os << "Y\t";
for (int i = 0; i < (int)ys->size(); i++)
for (size_t i = 0; i < ys->size(); i++)
{
os << ys->at(i) << '\t';
}
os << std::endl;
os << "Z\t";
for (int i = 0; i < (int)zs->size(); i++)
for (size_t i = 0; i < zs->size(); i++)
{
os << zs->at(i) << '\t';
}
os << std::endl;
os << "Bryantx\t";
for (int i = 0; i < (int)bryxs->size(); i++)
for (size_t i = 0; i < bryxs->size(); i++)
{
os << bryxs->at(i) << '\t';
}
os << std::endl;
os << "Bryanty\t";
for (int i = 0; i < (int)bryys->size(); i++)
for (size_t i = 0; i < bryys->size(); i++)
{
os << bryys->at(i) << '\t';
}
os << std::endl;
os << "Bryantz\t";
for (int i = 0; i < (int)bryzs->size(); i++)
for (size_t i = 0; i < bryzs->size(); i++)
{
os << bryzs->at(i) << '\t';
}
os << std::endl;
os << "VX\t";
for (int i = 0; i < (int)vxs->size(); i++)
for (size_t i = 0; i < vxs->size(); i++)
{
os << vxs->at(i) << '\t';
}
os << std::endl;
os << "VY\t";
for (int i = 0; i < (int)vys->size(); i++)
for (size_t i = 0; i < vys->size(); i++)
{
os << vys->at(i) << '\t';
}
os << std::endl;
os << "VZ\t";
for (int i = 0; i < (int)vzs->size(); i++)
for (size_t i = 0; i < vzs->size(); i++)
{
os << vzs->at(i) << '\t';
}
os << std::endl;
os << "OmegaX\t";
for (int i = 0; i < (int)omexs->size(); i++)
for (size_t i = 0; i < omexs->size(); i++)
{
os << omexs->at(i) << '\t';
}
os << std::endl;
os << "OmegaY\t";
for (int i = 0; i < (int)omeys->size(); i++)
for (size_t i = 0; i < omeys->size(); i++)
{
os << omeys->at(i) << '\t';
}
os << std::endl;
os << "OmegaZ\t";
for (int i = 0; i < (int)omezs->size(); i++)
for (size_t i = 0; i < omezs->size(); i++)
{
os << omezs->at(i) << '\t';
}
os << std::endl;
os << "AX\t";
for (int i = 0; i < (int)axs->size(); i++)
for (size_t i = 0; i < axs->size(); i++)
{
os << axs->at(i) << '\t';
}
os << std::endl;
os << "AY\t";
for (int i = 0; i < (int)ays->size(); i++)
for (size_t i = 0; i < ays->size(); i++)
{
os << ays->at(i) << '\t';
}
os << std::endl;
os << "AZ\t";
for (int i = 0; i < (int)azs->size(); i++)
for (size_t i = 0; i < azs->size(); i++)
{
os << azs->at(i) << '\t';
}
os << std::endl;
os << "AlphaX\t";
for (int i = 0; i < (int)alpxs->size(); i++)
for (size_t i = 0; i < alpxs->size(); i++)
{
os << alpxs->at(i) << '\t';
}
os << std::endl;
os << "AlphaY\t";
for (int i = 0; i < (int)alpys->size(); i++)
for (size_t i = 0; i < alpys->size(); i++)
{
os << alpys->at(i) << '\t';
}
os << std::endl;
os << "AlphaZ\t";
for (int i = 0; i < (int)alpzs->size(); i++)
for (size_t i = 0; i < alpzs->size(); i++)
{
os << alpzs->at(i) << '\t';
}
Expand Down
20 changes: 10 additions & 10 deletions OndselSolver/Array.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ namespace MbD {
template<typename T>
inline void Array<T>::copyFrom(std::shared_ptr<Array<T>> x)
{
for (int i = 0; i < (int)x->size(); i++) {
for (size_t i = 0; i < x->size(); i++) {
this->at(i) = x->at(i);
}
}
template<typename T>
inline void Array<T>::zeroSelf()
{
for (int i = 0; i < (int)this->size(); i++) {
for (size_t i = 0; i < this->size(); i++) {
this->at(i) = (T)0;
}
}
Expand All @@ -104,7 +104,7 @@ namespace MbD {
//inline double Array<double>::maxMagnitude()
//{
// double max = 0.0;
// for (int i = 0; i < this->size(); i++)
// for (size_t i = 0; i < >size(); i++)
// {
// auto element = this->at(i);
// if (element < 0.0) element = -element;
Expand All @@ -116,7 +116,7 @@ namespace MbD {
inline double Array<T>::maxMagnitudeOfVector()
{
double answer = 0.0;
for (int i = 0; i < (int)this->size(); i++)
for (size_t i = 0; i < this->size(); i++)
{
double mag = std::abs(this->at(i));
if (answer < mag) answer = mag;
Expand All @@ -126,9 +126,9 @@ namespace MbD {
template<typename T>
inline void Array<T>::equalArrayAt(std::shared_ptr<Array<T>> array, int i)
{
for (int ii = 0; ii < (int)this->size(); ii++)
for (size_t ii = 0; ii < this->size(); ii++)
{
this->at(ii) = array->at((int)i + ii);
this->at(ii) = array->at(i + ii);
}
}
//template<>
Expand All @@ -148,7 +148,7 @@ namespace MbD {
//template<>
//inline void Array<double>::conditionSelfWithTol(double tol)
//{
// for (int i = 0; i < this->size(); i++)
// for (size_t i = 0; i < >size(); i++)
// {
// double element = this->at(i);
// if (element < 0.0) element = -element;
Expand All @@ -164,7 +164,7 @@ namespace MbD {
//inline double Array<double>::length()
//{
// double ssq = 0.0;
// for (int i = 0; i < this->size(); i++)
// for (size_t i = 0; i < >size(); i++)
// {
// double elem = this->at(i);
// ssq += elem * elem;
Expand All @@ -174,7 +174,7 @@ namespace MbD {
template<typename T>
inline void Array<T>::magnifySelf(T factor)
{
for (int i = 0; i < (int)this->size(); i++)
for (size_t i = 0; i < this->size(); i++)
{
this->atitimes(i, factor);
}
Expand All @@ -189,4 +189,4 @@ namespace MbD {
{
this->at(i) *= factor;
}
}
}
2 changes: 1 addition & 1 deletion OndselSolver/ConstraintIJ.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

using namespace MbD;

ConstraintIJ::ConstraintIJ(EndFrmsptr frmi, EndFrmsptr frmj) : frmI(frmi), frmJ(frmj), Constraint()
ConstraintIJ::ConstraintIJ(EndFrmsptr frmi, EndFrmsptr frmj) : Constraint(), frmI(frmi), frmJ(frmj)
{
}

Expand Down
Loading