Changeset 34c2649 in sasview for sansmodels/src/sans/models/c_models/sc.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/sc.cpp (modified) (4 diffs)

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

@@ -75 +75 @@
 
         // Loop over radius weight points
-        for(int i=0; i<weights_rad.size(); i++) {
+        for(size_t i=0; i<weights_rad.size(); i++) {
                 dp[3] = weights_rad[i].value;
 
@@ -107 +107 @@
 double SCCrystalModel :: operator()(double qx, double qy) {
         SCParameters dp;
-        double q = sqrt(qx*qx + qy*qy);
         dp.scale      = scale();
         dp.dnn   = dnn();
@@ -142 +141 @@
         double pi = 4.0*atan(1.0);
         // Loop over radius weight points
-        for(int i=0; i<weights_rad.size(); i++) {
+        for(size_t i=0; i<weights_rad.size(); i++) {
                 dp.radius = weights_rad[i].value;
                 // Average over theta distribution
-                for(int j=0; j< weights_theta.size(); j++) {
+                for(size_t j=0; j< weights_theta.size(); j++) {
                         dp.theta = weights_theta[j].value;
                         // Average over phi distribution
-                        for(int k=0; k< weights_phi.size(); k++) {
+                        for(size_t k=0; k< weights_phi.size(); k++) {
                                 dp.phi = weights_phi[k].value;
                                 // Average over phi distribution
-                                for(int l=0; l< weights_psi.size(); l++) {
+                                for(size_t l=0; l< weights_psi.size(); l++) {
                                         dp.psi = weights_psi[l].value;
                                         //Un-normalize SphereForm by volume
@@ -212 +211 @@
 double SCCrystalModel :: calculate_ER() {
         //NOT implemented yet!!!
-}
+        return 0.0;
+}