fixing warnings #3

eclipse-sumo · Mar 31, 2024 · 25afefe · 25afefe
1 parent 2ec4670
commit 25afefe
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 23 deletions.
diff --git a/src/libsumo/InductionLoop.cpp b/src/libsumo/InductionLoop.cpp
@@ -197,7 +197,7 @@ int
 InductionLoop::getLastIntervalVehicleNumber(const std::string& loopID) {
     if (MSGlobals::gUseMesoSim) {
         WRITE_ERROR("getLastIntervalVehicleNumber not applicable for meso");
-        return INVALID_DOUBLE_VALUE;
+        return INVALID_INT_VALUE;
     }
     return getDetector(loopID)->getIntervalVehicleNumber(true);
 }

diff --git a/src/microsim/MSBaseVehicle.cpp b/src/microsim/MSBaseVehicle.cpp
@@ -324,7 +324,7 @@ MSBaseVehicle::reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<M
             }
             stops.push_back(viaEdge);
             if (jumpEdges.count(viaEdge) != 0) {
-                jumps.insert(stops.size());
+                jumps.insert((int)stops.size());
             }
         }
     }

diff --git a/src/microsim/output/MSMeanData.cpp b/src/microsim/output/MSMeanData.cpp
@@ -377,7 +377,7 @@ void
 MSMeanData::MeanDataValueTracker::write(OutputDevice& dev,
                                         long long int attributeMask,
                                         const SUMOTime period,
-                                        const double numLanes,
+                                        const int numLanes,
                                         const double speedLimit,
                                         const double defaultTravelTime,
                                         const int /*numVehicles*/) const {
@@ -585,7 +585,7 @@ MSMeanData::writeAggregated(OutputDevice& dev, SUMOTime startTime, SUMOTime stop
 
     if (writePrefix(dev, *sumData, SUMO_TAG_EDGE, "AGGREGATED")) {
         dev.writeAttr(SUMO_ATTR_NUMEDGES, myEdges.size());
-        sumData->write(dev, myWrittenAttributes, stopTime - startTime, (double)laneNumber, speedSum / (double)myEdges.size(),
+        sumData->write(dev, myWrittenAttributes, stopTime - startTime, laneNumber, speedSum / (double)myEdges.size(),
                        myPrintDefaults ? totalTT : -1.);
     }
     delete sumData;
@@ -610,7 +610,7 @@ MSMeanData::writeEdge(OutputDevice& dev,
             MeanDataValues* data = edgeValues.front();
             if (writePrefix(dev, *data, SUMO_TAG_EDGE, getEdgeID(edge))) {
                 data->write(dev, myWrittenAttributes, stopTime - startTime,
-                            (double)edge->getLanes().size(),
+                            (int)edge->getLanes().size(),
                             edge->getSpeedLimit(),
                             myPrintDefaults ? edge->getLength() / edge->getSpeedLimit() : -1.);
             }
@@ -637,7 +637,7 @@ MSMeanData::writeEdge(OutputDevice& dev,
         for (lane = edgeValues.begin(); lane != edgeValues.end(); ++lane) {
             MeanDataValues& meanData = **lane;
             if (writePrefix(dev, meanData, SUMO_TAG_LANE, meanData.getLane()->getID())) {
-                meanData.write(dev, myWrittenAttributes, stopTime - startTime, 1.f, meanData.getLane()->getSpeedLimit(),
+                meanData.write(dev, myWrittenAttributes, stopTime - startTime, 1, meanData.getLane()->getSpeedLimit(),
                                myPrintDefaults ? meanData.getLane()->getLength() / meanData.getLane()->getSpeedLimit() : -1.);
             }
             if (!MSNet::getInstance()->skipFinalReset()) {
@@ -651,7 +651,7 @@ MSMeanData::writeEdge(OutputDevice& dev,
         if (myTrackVehicles) {
             MeanDataValues& meanData = **edgeValues.begin();
             if (writePrefix(dev, meanData, SUMO_TAG_EDGE, edge->getID())) {
-                meanData.write(dev, myWrittenAttributes, stopTime - startTime, (double)edge->getLanes().size(), edge->getSpeedLimit(),
+                meanData.write(dev, myWrittenAttributes, stopTime - startTime, (int)edge->getLanes().size(), edge->getSpeedLimit(),
                                myPrintDefaults ? edge->getLength() / edge->getSpeedLimit() : -1.);
             }
             if (!MSNet::getInstance()->skipFinalReset()) {
@@ -667,7 +667,7 @@ MSMeanData::writeEdge(OutputDevice& dev,
                 }
             }
             if (writePrefix(dev, *sumData, SUMO_TAG_EDGE, getEdgeID(edge))) {
-                sumData->write(dev, myWrittenAttributes, stopTime - startTime, (double)edge->getLanes().size(), edge->getSpeedLimit(),
+                sumData->write(dev, myWrittenAttributes, stopTime - startTime, (int)edge->getLanes().size(), edge->getSpeedLimit(),
                                myPrintDefaults ? edge->getLength() / edge->getSpeedLimit() : -1.);
             }
             delete sumData;

diff --git a/src/microsim/output/MSMeanData.h b/src/microsim/output/MSMeanData.h
@@ -142,7 +142,7 @@ class MSMeanData : public MSDetectorFileOutput {
          * @exception IOError If an error on writing occurs (!!! not yet implemented)
          */
         virtual void write(OutputDevice& dev, long long int attributeMask, const SUMOTime period,
-                           const double numLanes, const double speedLimit, const double defaultTravelTime,
+                           const int numLanes, const double speedLimit, const double defaultTravelTime,
                            const int numVehicles = -1) const = 0;
 
         /** @brief Returns the number of collected sample seconds.
@@ -263,7 +263,7 @@ class MSMeanData : public MSDetectorFileOutput {
          * @exception IOError If an error on writing occurs (!!! not yet implemented)
          */
         void write(OutputDevice& dev, long long int attributeMask, const SUMOTime period,
-                   const double numLanes, const double speedLimit, const double defaultTravelTime,
+                   const int numLanes, const double speedLimit, const double defaultTravelTime,
                    const int numVehicles = -1) const;
 
         int getNumReady() const;

diff --git a/src/microsim/output/MSMeanData_Amitran.cpp b/src/microsim/output/MSMeanData_Amitran.cpp
@@ -108,7 +108,7 @@ MSMeanData_Amitran::MSLaneMeanDataValues::isEmpty() const {
 
 void
 MSMeanData_Amitran::MSLaneMeanDataValues::write(OutputDevice& dev, long long int attributeMask, const SUMOTime /* period */,
-        const double /* numLanes */, const double /*speedLimit*/, const double defaultTravelTime, const int /* numVehicles */) const {
+        const int /* numLanes */, const double /*speedLimit*/, const double defaultTravelTime, const int /* numVehicles */) const {
     int averageSpeed;
     if (sampleSeconds > 0) {
         averageSpeed = int(100 * travelledDistance / sampleSeconds);

diff --git a/src/microsim/output/MSMeanData_Amitran.h b/src/microsim/output/MSMeanData_Amitran.h
@@ -110,7 +110,7 @@ class MSMeanData_Amitran : public MSMeanData {
          * @exception IOError If an error on writing occurs (!!! not yet implemented)
          */
         void write(OutputDevice& dev, long long int attributeMask, const SUMOTime period,
-                   const double numLanes, const double speedLimit, const double defaultTravelTime,
+                   const int numLanes, const double speedLimit, const double defaultTravelTime,
                    const int numVehicles = -1) const;
 
     protected:

diff --git a/src/microsim/output/MSMeanData_Emissions.cpp b/src/microsim/output/MSMeanData_Emissions.cpp
@@ -96,7 +96,7 @@ MSMeanData_Emissions::MSLaneMeanDataValues::notifyIdle(SUMOTrafficObject& veh) {
 
 void
 MSMeanData_Emissions::MSLaneMeanDataValues::write(OutputDevice& dev, long long int attributeMask, const SUMOTime period,
-        const double /*numLanes*/, const double /*speedLimit*/, const double defaultTravelTime, const int /*numVehicles*/) const {
+        const int /*numLanes*/, const double /*speedLimit*/, const double defaultTravelTime, const int /*numVehicles*/) const {
     const double normFactor = double(3600. / STEPS2TIME(period) / myLaneLength);
     dev.writeOptionalAttr(SUMO_ATTR_CO_ABS,          OutputDevice::realString(myEmissions.CO, 6), attributeMask);
     dev.writeOptionalAttr(SUMO_ATTR_CO2_ABS,         OutputDevice::realString(myEmissions.CO2, 6), attributeMask);

diff --git a/src/microsim/output/MSMeanData_Emissions.h b/src/microsim/output/MSMeanData_Emissions.h
@@ -90,7 +90,7 @@ class MSMeanData_Emissions : public MSMeanData {
          * @exception IOError If an error on writing occurs (!!! not yet implemented)
          */
         void write(OutputDevice& dev, long long int attributeMask, const SUMOTime period,
-                   const double numLanes, const double speedLimit, const double defaultTravelTime,
+                   const int numLanes, const double speedLimit, const double defaultTravelTime,
                    const int numVehicles = -1) const;
 
 

diff --git a/src/microsim/output/MSMeanData_Harmonoise.cpp b/src/microsim/output/MSMeanData_Harmonoise.cpp
@@ -86,7 +86,7 @@ MSMeanData_Harmonoise::MSLaneMeanDataValues::notifyMoveInternal(const SUMOTraffi
 
 void
 MSMeanData_Harmonoise::MSLaneMeanDataValues::write(OutputDevice& dev, long long int attributeMask, const SUMOTime period,
-        const double /*numLanes*/, const double /*speedLimit*/, const double defaultTravelTime, const int /*numVehicles*/) const {
+        const int /*numLanes*/, const double /*speedLimit*/, const double defaultTravelTime, const int /*numVehicles*/) const {
     const double noise = meanNTemp != 0 ? (double)(10. * log10(meanNTemp * TS / STEPS2TIME(period))) : (double) 0.;
     dev.writeOptionalAttr(SUMO_ATTR_NOISE, noise, attributeMask);
     if (sampleSeconds > myParent->myMinSamples) {

diff --git a/src/microsim/output/MSMeanData_Harmonoise.h b/src/microsim/output/MSMeanData_Harmonoise.h
@@ -91,7 +91,7 @@ class MSMeanData_Harmonoise : public MSMeanData {
          * @exception IOError If an error on writing occurs (!!! not yet implemented)
          */
         void write(OutputDevice& dev, long long int attributeMask, const SUMOTime period,
-                   const double numLanes, const double speedLimit, const double defaultTravelTime,
+                   const int numLanes, const double speedLimit, const double defaultTravelTime,
                    const int numVehicles = -1) const;
 
 

diff --git a/src/microsim/output/MSMeanData_Net.cpp b/src/microsim/output/MSMeanData_Net.cpp
@@ -244,17 +244,17 @@ MSMeanData_Net::MSLaneMeanDataValues::isEmpty() const {
 
 double
 MSMeanData_Net::MSLaneMeanDataValues::getOccupancy(SUMOTime period, int numLanes) const {
-    return occupationSum / STEPS2TIME(period) / myLaneLength / numLanes * (double) 100;
+    return occupationSum / STEPS2TIME(period) / myLaneLength / (double)numLanes * 100.;
 }
 
 void
 MSMeanData_Net::MSLaneMeanDataValues::write(OutputDevice& dev, long long int attributeMask, const SUMOTime period,
-        const double numLanes, const double speedLimit, const double defaultTravelTime, const int numVehicles) const {
+        const int numLanes, const double speedLimit, const double defaultTravelTime, const int numVehicles) const {
 
-    const double density = MIN2(sampleSeconds / STEPS2TIME(period) * (double) 1000 / myLaneLength,
-                                1000. * numLanes / MAX2(minimalVehicleLength, NUMERICAL_EPS));
-    const double laneDensity = density / numLanes;
-    double occupancy = getOccupancy(period, numLanes);
+    const double density = MIN2(sampleSeconds / STEPS2TIME(period) * 1000. / myLaneLength,
+                                1000. * (double)numLanes / MAX2(minimalVehicleLength, NUMERICAL_EPS));
+    const double laneDensity = density / (double)numLanes;
+    const double occupancy = getOccupancy(period, numLanes);
 #ifdef DEBUG_OCCUPANCY2
     // tests #3264
     if (occupancy > 100) {

diff --git a/src/microsim/output/MSMeanData_Net.h b/src/microsim/output/MSMeanData_Net.h
@@ -123,7 +123,7 @@ class MSMeanData_Net : public MSMeanData {
          * @exception IOError If an error on writing occurs (!!! not yet implemented)
          */
         void write(OutputDevice& dev, long long int attributeMask, const SUMOTime period,
-                   const double numLanes, const double speedLimit, const double defaultTravelTime,
+                   const int numLanes, const double speedLimit, const double defaultTravelTime,
                    const int numVehicles = -1) const;
 
         /// @brief return attribute value