Changeset 3080527 in sasview for sansmodels/src/sans/models/c_models/CBinaryHSModel.cpp

Timestamp:

Mar 12, 2010 1:08:42 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

e575db9

Parents:

7e99f5c

Message:

changed classtemplate for 2d evaluation from matrix form to 1d array form

File:

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

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

@@ -184 +184 @@
  {
     PyArrayObject *result;
-    int i,j, x_len, y_len, dims[2];
+    int i,j, x_len, y_len, dims[1];
     //check validity of input vectors
-    if (x->nd != 2 || x->descr->type_num != PyArray_DOUBLE
-        || y->nd != 2 || y->descr->type_num != PyArray_DOUBLE
-        || y->dimensions[1] != x->dimensions[0]){
+    if (x->nd != 1 || x->descr->type_num != PyArray_DOUBLE
+        || y->nd != 1 || y->descr->type_num != PyArray_DOUBLE
+        || y->dimensions[0] != x->dimensions[0]){
         const char * message= "evaluateTwoDimXY  expect 2 numpy arrays";
         PyErr_SetString(PyExc_ValueError , message); 
@@ -196 +196 @@
         if (PyArray_Check(x) && PyArray_Check(y)) {
                 
-            x_len = dims[1]= x->dimensions[1];
+            x_len = dims[0]= x->dimensions[0];
         y_len = dims[0]= y->dimensions[0];
             
             // Make a new double matrix of same dims
-        result=(PyArrayObject *) PyArray_FromDims(2,dims,NPY_DOUBLE);
+        result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE);
         if (result == NULL){
             const char * message= "Could not create result ";
@@ -208 +208 @@
        
         /* Do the calculation. */
-        for ( j=0; j< y_len; j++) {
-            for ( i=0; i< x_len; i++) {
-                double x_value = *(double *)(x->data + i*x->strides[1]);
-                    double y_value = *(double *)(y->data + j*y->strides[0]);
-                        double *result_value = (double *)(result->data +
-                              j*result->strides[0] + i*result->strides[1]);
-                        *result_value = (*model)(x_value, y_value);
-            }           
-        }
+        for ( i=0; i< x_len; i++) {
+            double x_value = *(double *)(x->data + i*x->strides[0]);
+                    double y_value = *(double *)(y->data + i*y->strides[0]);
+                        double *result_value = (double *)(result->data +
+                              i*result->strides[0]);
+                        *result_value = (*model)(x_value, y_value);
+        }           
         return PyArray_Return(result);