Skip to content

Commit

Permalink
fixing warnings refs #12
Browse files Browse the repository at this point in the history
git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15722 afbd958f-9f77-42d5-a016-97a22340ccf4
  • Loading branch information
namdre committed Feb 25, 2014
1 parent f8e6fba commit 7a397c3
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions sumo/src/utils/emissions/PHEMCEP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ PHEMCEP::PHEMCEP(bool heavyVehicel, SUMOEmissionClass emissionClass,
std::vector< std::vector<double> > pollutantMeasures;

// init pollutant identifiers
for(int i=0; i<headerLinePollutants.size(); i++)
for(int i=0; i<(int)headerLinePollutants.size(); i++)
{
pollutantIdentifier.push_back(headerLinePollutants[i]);
} // end for
Expand All @@ -79,15 +79,15 @@ PHEMCEP::PHEMCEP(bool heavyVehicel, SUMOEmissionClass emissionClass,
_sizeOfPatternPollutants = matrixPollutants.size();

// initialize measures
for(int i=0; i<headerLinePollutants.size(); i++)
for(int i=0; i<(int)headerLinePollutants.size(); i++)
{
pollutantMeasures.push_back(std::vector<double>());
} // end for

// looping through matrix and assigning values for speed rotational table
_speedCurveRotational.clear();
_speedPatternRotational.clear();
for(int i=0; i<matrixSpeedRotational.size(); i++)
for(int i=0; i<(int)matrixSpeedRotational.size(); i++)
{
if(matrixSpeedRotational[i].size() != 2)
throw InvalidArgument("Error loading vehicle file for: " + SumoEmissionClassStrings.getString(emissionClass));
Expand All @@ -99,7 +99,7 @@ PHEMCEP::PHEMCEP(bool heavyVehicel, SUMOEmissionClass emissionClass,

// looping through matrix and assigning values for Fuel consumption
_cepCurveFC.clear();
for(int i=0; i<matrixFC.size(); i++)
for(int i=0; i<(int)matrixFC.size(); i++)
{
if(matrixFC[i].size() != 2)
throw InvalidArgument("Error loading vehicle file for: " + SumoEmissionClassStrings.getString(emissionClass));
Expand All @@ -123,9 +123,9 @@ PHEMCEP::PHEMCEP(bool heavyVehicel, SUMOEmissionClass emissionClass,
} // end if

int headerCount = headerLinePollutants.size();
for(int i=0; i<matrixPollutants.size(); i++)
for(int i=0; i<(int)matrixPollutants.size(); i++)
{
for(int j=0; j<matrixPollutants[i].size(); j++)
for(int j=0; j<(int)matrixPollutants[i].size(); j++)
{
if(matrixPollutants[i].size() != headerCount + 1)
return;
Expand All @@ -143,7 +143,7 @@ PHEMCEP::PHEMCEP(bool heavyVehicel, SUMOEmissionClass emissionClass,
} // end for
} // end for

for(int i=0; i<headerLinePollutants.size(); i++)
for(int i=0; i<(int)headerLinePollutants.size(); i++)
{
_cepCurvePollutants.insert(pollutantIdentifier[i], pollutantMeasures[i]);
} // end for
Expand Down

0 comments on commit 7a397c3

Please sign in to comment.