Changeset 34c2649 in sasview for sansmodels/src/sans/models/c_models/fuzzysphere.cpp

Timestamp:

Nov 21, 2011 4:52:25 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1810613

Parents:

afea8fe

Message:

Re #4 Fixed warnings

File:

• sansmodels/src/sans/models/c_models/fuzzysphere.cpp (modified) (3 diffs)

sansmodels/src/sans/models/c_models/fuzzysphere.cpp

@@ -68 +68 @@
 
         // Loop over radius weight points
-        for(int i=0; i<weights_radius.size(); i++) {
+        for(size_t i=0; i<weights_radius.size(); i++) {
                 dp[1] = weights_radius[i].value;
                 // Loop over fuzziness weight points
-                for(int j=0; j<weights_fuzziness.size(); j++) {
+                for(size_t j=0; j<weights_fuzziness.size(); j++) {
                         dp[2] = weights_fuzziness[j].value;
 
@@ -119 +119 @@
  */
 double FuzzySphereModel :: calculate_ER() {
-        FuzzySphereParameters dp;
-        dp.scale = scale();
-        dp.radius = radius();
-        dp.fuzziness = fuzziness();
-        dp.sldSph = sldSph();
-        dp.sldSolv = sldSolv();
-        dp.background = background();
         double rad_out = 0.0;
 
@@ -137 +130 @@
         radius.get_weights(weights_radius);
         // Loop over radius weight points to average the radius value
-        for(int i=0; i<weights_radius.size(); i++) {
+        for(size_t i=0; i<weights_radius.size(); i++) {
                 sum += weights_radius[i].weight
                         * weights_radius[i].value;