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

Timestamp:

Sep 9, 2009 7:06:42 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

3b865c1

Parents:

d2caa18

Message:

wrote unittest for all model untested , haven' test critial point error handling

File:

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

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

@@ -18 +18 @@
  *
  * WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
- *          DO NOT MODIFY THIS FILE, MODIFY binaryHS.h
+ *          DO NOT MODIFY THIS FILE, MODIFY binaryHs.h
  *          AND RE-RUN THE GENERATOR SCRIPT
  *
@@ -33 +33 @@
 #include <math.h>
 #include <time.h>
-#include "binaryHS.h"
+#include "binaryHs.h"
 }
 
@@ -192 +192 @@
         if (PyArray_Check(x) && PyArray_Check(y)) {
                 
-            x_len = dims[1]= x->dimensions[0];
-        y_len = dims[0]= y->dimensions[1];
+            x_len = dims[1]= x->dimensions[1];
+        y_len = dims[0]= y->dimensions[0];
             
             // Make a new double matrix of same dims
@@ -206 +206 @@
         for ( j=0; j< y_len; j++) {
             for ( i=0; i< x_len; i++) {
-                double x_value = *(double *)(x->data + i*x->strides[0]);
-                    double y_value = *(double *)(y->data + j*y->strides[1]);
+                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]);