From 6e334809b495299eed7ac6d6f13e43a7f0c27449 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Mon, 17 Apr 2017 15:39:15 +0200
Subject: [PATCH] Use container's empty method instead of size == 0.
---
.../DataView/StratView/StratScene.cpp | 2 +-
.../DataExplorer/VtkVis/VtkPointsSource.cpp | 2 +-
.../DataExplorer/VtkVis/VtkPolylinesSource.cpp | 4 ++--
.../DataExplorer/VtkVis/VtkStationSource.cpp | 2 +-
.../DataExplorer/VtkVis/VtkSurfacesSource.cpp | 2 +-
.../DataExplorer/VtkVis/VtkVisTabWidget.cpp | 2 +-
Applications/DataExplorer/mainwindow.cpp | 4 ++--
Applications/FileIO/PetrelInterface.cpp | 4 ++--
GeoLib/IO/Legacy/OGSIOVer4.cpp | 16 ++++++++--------
GeoLib/StationBorehole.cpp | 2 +-
ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h | 2 +-
ProcessLib/HT/CreateHTProcess.cpp | 2 +-
ProcessLib/HT/HTFEM.h | 2 +-
ProcessLib/HeatConduction/HeatConductionFEM.h | 2 +-
ProcessLib/HydroMechanics/HydroMechanicsFEM.h | 2 +-
ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h | 2 +-
ProcessLib/RichardsFlow/RichardsFlowFEM.h | 4 ++--
ProcessLib/TES/TESReactionAdaptor.cpp | 2 +-
.../CreateTwoPhaseFlowWithPPProcess.cpp | 2 +-
.../TwoPhaseFlowWithPPLocalAssembler.h | 4 ++--
.../CreateTwoPhaseFlowWithPrhoProcess.cpp | 2 +-
.../TwoPhaseFlowWithPrhoLocalAssembler.h | 4 ++--
22 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/Applications/DataExplorer/DataView/StratView/StratScene.cpp b/Applications/DataExplorer/DataView/StratView/StratScene.cpp
index ad39310169f..6ad50d170bf 100644
--- a/Applications/DataExplorer/DataView/StratView/StratScene.cpp
+++ b/Applications/DataExplorer/DataView/StratView/StratScene.cpp
@@ -58,7 +58,7 @@ StratScene::StratScene(GeoLib::StationBorehole* station,
addDepthLabels(station->getProfile(), stratBarOffset + stratBarBounds.width());
- if (station->getSoilNames().size() > 0)
+ if (!station->getSoilNames().empty())
addSoilNameLabels(station->getSoilNames(), station->getProfile(), stratBarOffset +
(stratBarBounds.width() / 2));
}
diff --git a/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp b/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
index 23552d614fc..8c5ee2b0a51 100644
--- a/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
@@ -45,7 +45,7 @@ void VtkPointsSource::PrintSelf( ostream& os, vtkIndent indent )
{
this->Superclass::PrintSelf(os,indent);
- if (_points->size() == 0)
+ if (_points->empty())
return;
os << indent << "== VtkPointsSource ==" << "\n";
diff --git a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
index 747da52d917..eb162fe5395 100644
--- a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
@@ -51,7 +51,7 @@ void VtkPolylinesSource::PrintSelf( ostream& os, vtkIndent indent )
{
this->Superclass::PrintSelf(os,indent);
- if (_polylines->size() == 0)
+ if (_polylines->empty())
return;
for (auto _polyline : *_polylines)
@@ -77,7 +77,7 @@ int VtkPolylinesSource::RequestData( vtkInformation* request,
if (!_polylines)
return 0;
- if (_polylines->size() == 0)
+ if (_polylines->empty())
{
ERR("VtkPolylineSource::RequestData(): Size of polyline vector is 0");
return 0;
diff --git a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
index 18813e77199..ee10fdded3d 100644
--- a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
@@ -48,7 +48,7 @@ void VtkStationSource::PrintSelf( ostream& os, vtkIndent indent )
{
this->Superclass::PrintSelf(os,indent);
- if (_stations->size() == 0)
+ if (_stations->empty())
return;
os << indent << "== VtkStationSource ==" << "\n";
diff --git a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
index 28f4362f1e3..27b12c9feec 100644
--- a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
@@ -48,7 +48,7 @@ void VtkSurfacesSource::PrintSelf( ostream& os, vtkIndent indent )
{
this->Superclass::PrintSelf(os,indent);
- if (_surfaces->size() == 0)
+ if (_surfaces->empty())
return;
os << indent << "== VtkSurfacesSource ==" << "\n";
diff --git a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
index 867dec7385d..4c3e61bb59c 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
@@ -319,7 +319,7 @@ void VtkVisTabWidget::buildProportiesDialog(VtkVisPipelineItem* item)
QList<QVariant> values = i.value();
VtkAlgorithmPropertyVectorEdit* vectorEdit;
- if (values.size() > 0)
+ if (!values.empty())
{
QList<QString> valuesAsString;
foreach (QVariant variant, values)
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index 21c11b6f59e..905df83a4af 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -746,7 +746,7 @@ void MainWindow::loadPetrelFiles()
this, "Select surface data file(s) to import", "", "Petrel files (*)");
QStringList well_path_file_names = QFileDialog::getOpenFileNames(
this, "Select well path data file(s) to import", "", "Petrel files (*)");
- if (sfc_file_names.size() != 0 || well_path_file_names.size() != 0)
+ if (!sfc_file_names.empty() || !well_path_file_names.empty())
{
QStringList::const_iterator it = sfc_file_names.begin();
std::list<std::string> sfc_files;
@@ -1284,7 +1284,7 @@ QString MainWindow::getLastUsedDir()
QSettings settings;
QString fileName("");
QStringList files = settings.value("recentFileList").toStringList();
- if (files.size() != 0)
+ if (!files.empty())
return QFileInfo(files[0]).absolutePath();
else
return QDir::homePath();
diff --git a/Applications/FileIO/PetrelInterface.cpp b/Applications/FileIO/PetrelInterface.cpp
index a8b264fc5a6..60a507b864a 100644
--- a/Applications/FileIO/PetrelInterface.cpp
+++ b/Applications/FileIO/PetrelInterface.cpp
@@ -67,11 +67,11 @@ PetrelInterface::PetrelInterface(std::list<std::string> &sfc_fnames,
// store data in GEOObject
geo_obj->addPointVec(std::unique_ptr<std::vector<GeoLib::Point*>>(pnt_vec),
_unique_name);
- if (well_vec->size() > 0)
+ if (!well_vec->empty())
geo_obj->addStationVec(
std::unique_ptr<std::vector<GeoLib::Point*>>(well_vec),
_unique_name);
- if (ply_vec->size() > 0)
+ if (!ply_vec->empty())
geo_obj->addPolylineVec(
std::unique_ptr<std::vector<GeoLib::Polyline*>>(ply_vec),
_unique_name);
diff --git a/GeoLib/IO/Legacy/OGSIOVer4.cpp b/GeoLib/IO/Legacy/OGSIOVer4.cpp
index 6dc1e1e0681..8ee236a7076 100644
--- a/GeoLib/IO/Legacy/OGSIOVer4.cpp
+++ b/GeoLib/IO/Legacy/OGSIOVer4.cpp
@@ -187,9 +187,9 @@ std::string readPolyline(std::istream &in,
{ // read the point ids
in >> line;
if (type != 100)
- while (!in.eof() && !in.fail() && line.size() != 0
- && (line.find('#') == std::string::npos)
- && (line.find('$') == std::string::npos))
+ while (!in.eof() && !in.fail() && !line.empty() &&
+ (line.find('#') == std::string::npos) &&
+ (line.find('$') == std::string::npos))
{
auto pnt_id(BaseLib::str2number<std::size_t>(line));
if (!zero_based_indexing)
@@ -219,7 +219,7 @@ std::string readPolyline(std::istream &in,
line = path + line;
readPolylinePointVector(line, pnt_vec, ply, path, errors);
} // subkeyword found
- } while (line.find('#') == std::string::npos && line.size() != 0 && in);
+ } while (line.find('#') == std::string::npos && !line.empty() && in);
if (type != 100)
{
@@ -322,9 +322,9 @@ std::string readSurface(std::istream &in,
if (line.find("$POLYLINES") != std::string::npos) // subkeyword found
{ // read the name of the polyline(s)
in >> line;
- while (!in.eof() && !in.fail() && line.size() != 0
- && (line.find('#') == std::string::npos)
- && (line.find('$') == std::string::npos))
+ while (!in.eof() && !in.fail() && !line.empty() &&
+ (line.find('#') == std::string::npos) &&
+ (line.find('$') == std::string::npos))
{
// we did read the name of a polyline -> search the id for polyline
auto it(ply_vec_names.find(line));
@@ -355,7 +355,7 @@ std::string readSurface(std::istream &in,
}
// empty line or a keyword is found
}
- } while (line.find('#') == std::string::npos && line.size() != 0 && in);
+ } while (line.find('#') == std::string::npos && !line.empty() && in);
if (!name.empty())
sfc_names.insert(std::pair<std::string,std::size_t>(name,sfc_vec.size()));
diff --git a/GeoLib/StationBorehole.cpp b/GeoLib/StationBorehole.cpp
index e0ed2b20478..57671ab879f 100644
--- a/GeoLib/StationBorehole.cpp
+++ b/GeoLib/StationBorehole.cpp
@@ -140,7 +140,7 @@ int StationBorehole::addLayer(std::list<std::string> fields, StationBorehole* bo
int StationBorehole::addStratigraphy(const std::vector<Point*> &profile, const std::vector<std::string> &soil_names)
{
- if (((profile.size()-1) == soil_names.size()) && (soil_names.size()>0))
+ if (((profile.size() - 1) == soil_names.size()) && (!soil_names.empty()))
{
this->_profilePntVec.push_back(profile[0]);
std::size_t nLayers = soil_names.size();
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
index 0fb418c1f62..d9734be0888 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
@@ -190,7 +190,7 @@ public:
std::vector<double> const& getIntPtDarcyVelocityX(
std::vector<double>& /*cache*/) const override
{
- assert(_darcy_velocities.size() > 0);
+ assert(!_darcy_velocities.empty());
return _darcy_velocities[0];
}
diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp
index 29076a86289..987df379781 100644
--- a/ProcessLib/HT/CreateHTProcess.cpp
+++ b/ProcessLib/HT/CreateHTProcess.cpp
@@ -139,7 +139,7 @@ std::unique_ptr<Process> createHTProcess(
std::vector<double> const b =
//! \ogs_file_param{prj__processes__process__HT__specific_body_force}
config.getConfigParameter<std::vector<double>>("specific_body_force");
- assert(b.size() > 0 && b.size() < 4);
+ assert(!b.empty() && b.size() < 4);
bool const has_gravity = MathLib::toVector(b).norm() > 0;
if (has_gravity)
std::copy_n(b.data(), b.size(), specific_body_force.data());
diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h
index f2cbd909e58..92ff83a8aaa 100644
--- a/ProcessLib/HT/HTFEM.h
+++ b/ProcessLib/HT/HTFEM.h
@@ -278,7 +278,7 @@ public:
std::vector<double> const& getIntPtDarcyVelocityX(
std::vector<double>& /*cache*/) const override
{
- assert(_darcy_velocities.size() > 0);
+ assert(!_darcy_velocities.empty());
return _darcy_velocities[0];
}
diff --git a/ProcessLib/HeatConduction/HeatConductionFEM.h b/ProcessLib/HeatConduction/HeatConductionFEM.h
index 1afceed27c7..1dc74f69749 100644
--- a/ProcessLib/HeatConduction/HeatConductionFEM.h
+++ b/ProcessLib/HeatConduction/HeatConductionFEM.h
@@ -171,7 +171,7 @@ public:
std::vector<double> const& getIntPtHeatFluxX(
std::vector<double>& /*cache*/) const override
{
- assert(_heat_fluxes.size() > 0);
+ assert(!_heat_fluxes.empty());
return _heat_fluxes[0];
}
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
index 591cffa4b36..1914d9f8ff5 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
@@ -539,7 +539,7 @@ public:
std::vector<double> const& getIntPtDarcyVelocityX(
std::vector<double>& /*cache*/) const override
{
- assert(_darcy_velocities.size() > 0);
+ assert(!_darcy_velocities.empty());
return _darcy_velocities[0];
}
diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
index d45f13017ee..c6adbf2bf32 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
@@ -116,7 +116,7 @@ public:
std::vector<double> const& getIntPtDarcyVelocityX(
std::vector<double>& /*cache*/) const override
{
- assert(_darcy_velocities.size() > 0);
+ assert(!_darcy_velocities.empty());
return _darcy_velocities[0];
}
diff --git a/ProcessLib/RichardsFlow/RichardsFlowFEM.h b/ProcessLib/RichardsFlow/RichardsFlowFEM.h
index 759c633880b..caf5a78f605 100644
--- a/ProcessLib/RichardsFlow/RichardsFlowFEM.h
+++ b/ProcessLib/RichardsFlow/RichardsFlowFEM.h
@@ -235,14 +235,14 @@ public:
std::vector<double> const& getIntPtSaturation(
std::vector<double>& /*cache*/) const override
{
- assert(_saturation.size() > 0);
+ assert(!_saturation.empty());
return _saturation;
}
std::vector<double> const& getIntPtDarcyVelocityX(
std::vector<double>& /*cache*/) const override
{
- assert(_darcy_velocities.size() > 0);
+ assert(!_darcy_velocities.empty());
return _darcy_velocities[0];
}
diff --git a/ProcessLib/TES/TESReactionAdaptor.cpp b/ProcessLib/TES/TESReactionAdaptor.cpp
index edd977ca082..85bb8cdb16b 100644
--- a/ProcessLib/TES/TESReactionAdaptor.cpp
+++ b/ProcessLib/TES/TESReactionAdaptor.cpp
@@ -65,7 +65,7 @@ TESFEMReactionAdaptorAdsorption::TESFEMReactionAdaptorAdsorption(
assert(dynamic_cast<Adsorption::AdsorptionReaction const*>(
data.ap.react_sys.get()) != nullptr &&
"Reactive system has wrong type.");
- assert(_bounds_violation.size() != 0);
+ assert(!_bounds_violation.empty());
}
ReactionRate
diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp
index 03375787171..8bd46d221fb 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp
@@ -58,7 +58,7 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess(
std::vector<double> const b =
//! \ogs_file_param{prj__processes__process__TWOPHASE_FLOW_PP__specific_body_force}
config.getConfigParameter<std::vector<double>>("specific_body_force");
- assert(b.size() > 0 && b.size() < 4);
+ assert(!b.empty() && b.size() < 4);
Eigen::VectorXd specific_body_force(b.size());
bool const has_gravity = MathLib::toVector(b).norm() > 0;
if (has_gravity)
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler.h
index 8915b94b9d2..9c53d8678c6 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler.h
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler.h
@@ -137,14 +137,14 @@ public:
std::vector<double> const& getIntPtSaturation(
std::vector<double>& /*cache*/) const override
{
- assert(_saturation.size() > 0);
+ assert(!_saturation.empty());
return _saturation;
}
std::vector<double> const& getIntPtWetPressure(
std::vector<double>& /*cache*/) const override
{
- assert(_pressure_wet.size() > 0);
+ assert(!_pressure_wet.empty());
return _pressure_wet;
}
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp
index 62288cf12b3..2e794cf91d4 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp
@@ -58,7 +58,7 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess(
std::vector<double> const b =
//! \ogs_file_param{prj__processes__process__TWOPHASE_FLOW_PRHO__specific_body_force}
config.getConfigParameter<std::vector<double>>("specific_body_force");
- assert(b.size() > 0 && b.size() < 4);
+ assert(!b.empty() && b.size() < 4);
Eigen::VectorXd specific_body_force(b.size());
bool const has_gravity = MathLib::toVector(b).norm() > 0;
if (has_gravity)
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
index acd3f3c46e9..28c994d8f84 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
@@ -140,14 +140,14 @@ public:
std::vector<double> const& getIntPtSaturation(
std::vector<double>& /*cache*/) const override
{
- assert(_saturation.size() > 0);
+ assert(!_saturation.empty());
return _saturation;
}
std::vector<double> const& getIntPtNonWettingPressure(
std::vector<double>& /*cache*/) const override
{
- assert(_pressure_nonwetting.size() > 0);
+ assert(!_pressure_nonwetting.empty());
return _pressure_nonwetting;
}
--
GitLab