Changeset 11739 for code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc

Timestamp:

Feb 12, 2018, 12:17:34 AM (6 years ago)

Author:

landauf

Message:

[AsteroidMining_HS17] fixed a bunch of compiler warnings

File:

• code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) (8 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc

@@ -115 +115 @@
     }
 
-    void AsteroidMinable::setSize(int s)
+    void AsteroidMinable::setSize(float s)
     {
         this->size = s;
@@ -214 +214 @@
     if (this->size <=1){return;} // Absicherung trivialer Fall
 
-    int massRem = this->size-1; //some mass is lost
-    int num = round(rnd()*(massRem-1)) + 1; // random number of children, at least one
+    float massRem = (this->size-1); //some mass is lost
+    int num = (int)roundf(rnd(massRem-1)) + 1; // random number of children, at least one
     if(num > 10){num = 10;} // no max function in C? 
-    std::vector<int> masses(num); // Masses of the asteroids
+    std::vector<float> masses(num); // Masses of the asteroids
     // orxout() << "SpawnChildren(): Passed basic stuff. num = " << num << "; massRem(total) = "<< massRem << endl;
     massRem = massRem-num; // mass must be at least one, add later.  
@@ -228 +228 @@
     for(int twat = 0; twat<num; ++twat)
     {
-        masses[twat] = 0;
+        masses[twat] = 0.0f;
         phi[twat] = 0.0f;
         theta[twat] = 0.0f;
@@ -236 +236 @@
     float d_p = 2*piG/num;
     float d_t = piG/num;
-    float p = d_p/2.0;
-    float t = d_t/2.0;
+    float p = d_p/2.0f;
+    float t = d_t/2.0f;
     // float phiOffset = rnd()*2*pi; // Added everywhere to become independent of the coordinate system?
     // float thetaOffset = rnd()*pi;
@@ -251 +251 @@
         for(int it = 0; it<num; ++it){
 
-            pos = mod((int)(rnd()*num),num); 
+            pos = mod((int)(rnd((float)num)),num);
             while(phi[pos] != 0.0){// find empty spot in array
                 pos = (int)mod(++pos, num);
@@ -257 +257 @@
             phi[pos] = p + it*d_p;// set angle there
 
-            pos = mod((int)(rnd()*num),num);
+            pos = mod((int)(rnd((float)num)),num);
             while(theta[pos] != 0.0){
                 pos = (int)mod(++pos, num);
@@ -271 +271 @@
     // Triangular, discrete probability "density" with max at the average value massRem/num. 50% chance to be below that. 
     if(massRem>0){
-        int c = massRem;
+        int c = (int)massRem;
         std::vector<float> probDensity(c);
 
-        int a = round(massRem/num);
+        int a = (int)roundf(massRem/num);
         int b = c-a;
         
         int z = 0;
-        float dProbA = 1.0/(a*a + 3.0*a + 2.0); // one 'probability unit' for discrete ramp function. Gauss stuff. 
+        float dProbA = 1.0f/(a*a + 3.0f*a + 2.0f); // one 'probability unit' for discrete ramp function. Gauss stuff.
         for(z = 0; z<a; ++z){probDensity[z] = (z+1)*dProbA; } // rising part
 
-        float dProbB = 1.0/(b*b +3.0*b + 2.0);
+        float dProbB = 1.0f/(b*b +3.0f*b + 2.0f);
         for(z = 0; z<b; ++z){probDensity[c-1-z] = (z+1)*dProbB;} // falling part
     
@@ -306 +306 @@
             }
 
-            masses[trav] = 1 +result; // Fragments have mass of at least one. 
+            masses[trav] = 1.0f + result; // Fragments have mass of at least one.
             massRem = massRem-result;