Changeset f1e0c1eb in sasview for sansmodels/src/c_models

Timestamp:

Jul 26, 2012 8:53:20 AM (12 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

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:

7fdb332

Parents:

32ea318

Message:

Added basic unit tests for star polymer model

File:

• sansmodels/src/c_models/starpolymer.cpp (modified) (2 diffs)

sansmodels/src/c_models/starpolymer.cpp

@@ -6 +6 @@
 
 **/
-
 
 #include <math.h>
@@ -29 +28 @@
 
   double u = d_R2 * pow(q,2);
-  double v = pow(u,2) * d_arms / (3 * d_arms - 2);
+  double v = pow(u,2.0) * d_arms / (3.0 * d_arms - 2.0);
 
-  double term1 = v - 1 + exp(-v);
-  double term2 = ((d_arms - 1)/2)* pow((1 - exp(-v)),2);
+  double term1 = v - 1.0 + exp(-v);
+  double term2 = ((d_arms - 1.0)/2.0)* pow((1.0 - exp(-v)),2.0);
 
-  return 2 * d_scale / (d_arms * pow(v,2)) * (term1 + term2) + d_background;
+  return 2.0 * d_scale / (d_arms * pow(v,2.0)) * (term1 + term2) + d_background;
 
 }