Changeset 62dc94b in sasview


Ignore:
Timestamp:
Jan 10, 2012 5:06:34 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:
5c3aafa
Parents:
592cb156
Message:

Add quick test for the C++ library

Location:
sansmodels
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/CMakeLists.txt

    r503a972 r62dc94b  
    88 
    99set (SRC_FILES 
     10    src/c_models/barbell.cpp 
     11    src/c_models/bcc.cpp 
     12    src/c_models/binaryHS.cpp 
     13    src/c_models/binaryHS_PSF11.cpp 
     14    src/c_models/capcyl.cpp 
     15    src/c_models/corefourshell.cpp 
     16    src/c_models/coreshellcylinder.cpp 
     17    src/c_models/coreshellsphere.cpp 
     18    src/c_models/csparallelepiped.cpp 
     19    src/c_models/cylinder.cpp 
     20    src/c_models/DiamCyl.cpp 
     21    src/c_models/DiamEllip.cpp 
     22    src/c_models/dispersion_visitor.cpp 
     23    src/c_models/ellipsoid.cpp 
     24    src/c_models/ellipticalcylinder.cpp 
     25    src/c_models/fcc.cpp 
     26    src/c_models/flexcyl_ellipX.cpp 
     27    src/c_models/flexiblecylinder.cpp 
     28    src/c_models/fractal.cpp 
     29    src/c_models/fuzzysphere.cpp 
     30    src/c_models/gamma_win.c 
     31    src/c_models/gaussian.cpp 
     32    src/c_models/Hardsphere.cpp 
     33    src/c_models/HayterMSA.cpp 
     34    src/c_models/hollowcylinder.cpp 
     35    src/c_models/lamellar.cpp 
     36    src/c_models/lamellarFF_HG.cpp 
     37    src/c_models/lamellarPC.cpp 
     38    src/c_models/lamellarPS.cpp 
     39    src/c_models/lamellarPS_HG.cpp 
     40    src/c_models/libfunc.c 
    1041    src/c_models/librefl.c 
    11     src/c_models/binaryHS.cpp 
     42    src/c_models/logNormal.cpp 
     43    src/c_models/lorentzian.cpp 
     44    src/c_models/multishell.cpp 
    1245    src/c_models/onion.cpp 
    13     src/c_models/vesicle.cpp 
     46    src/c_models/parallelepiped.cpp 
     47    src/c_models/parameters.cpp 
     48    src/c_models/pearlnecklace.cpp 
     49    src/c_models/polygausscoil.cpp 
     50    src/c_models/refl.cpp 
     51    src/c_models/refl_adv.cpp 
     52    src/c_models/rpa.cpp 
     53    src/c_models/sc.cpp 
     54    src/c_models/schulz.cpp 
    1455    src/c_models/sld_cal.cpp 
    15     src/c_models/parallelepiped.cpp 
    16     src/c_models/coreshellcylinder.cpp 
    17     src/c_models/logNormal.cpp 
     56    src/c_models/sphere.cpp 
     57    src/c_models/spheresld.cpp 
     58    src/c_models/spheroid.cpp 
     59    src/c_models/SquareWell.cpp 
     60    src/c_models/stackeddisks.cpp 
    1861    src/c_models/StickyHS.cpp 
    1962    src/c_models/triaxialellipsoid.cpp 
    20     src/c_models/coreshellsphere.cpp 
    21     src/c_models/HayterMSA.cpp 
    22     src/c_models/csparallelepiped.cpp 
    23     src/c_models/fractal.cpp 
    24     src/c_models/spheresld.cpp 
    25     src/c_models/parameters.cpp 
    26     src/c_models/cylinder.cpp 
    27     src/c_models/schulz.cpp 
    28     src/c_models/gamma_win.c 
    29     src/c_models/libfunc.c 
    30     src/c_models/lamellar.cpp 
    31     src/c_models/stackeddisks.cpp 
    32     src/c_models/bcc.cpp 
    33     src/c_models/lamellarPS_HG.cpp 
    34     src/c_models/ellipticalcylinder.cpp 
    35     src/c_models/refl_adv.cpp 
    36     src/c_models/barbell.cpp 
    37     src/c_models/spheroid.cpp 
    38     src/c_models/lamellarPC.cpp 
    39     src/c_models/binaryHS_PSF11.cpp 
    40     src/c_models/sphere.cpp 
    41     src/c_models/DiamEllip.cpp 
    42     src/c_models/pearlnecklace.cpp 
    43     src/c_models/SquareWell.cpp 
    44     src/c_models/refl.cpp 
    45     src/c_models/multishell.cpp 
    46     src/c_models/polygausscoil.cpp 
    47     src/c_models/corefourshell.cpp 
    48     src/c_models/lamellarFF_HG.cpp 
    49     src/c_models/flexcyl_ellipX.cpp 
    50     src/c_models/capcyl.cpp 
    51     src/c_models/fuzzysphere.cpp 
    52     src/c_models/lamellarPS.cpp 
    53     src/c_models/Hardsphere.cpp 
    54     src/c_models/hollowcylinder.cpp 
    55     src/c_models/fcc.cpp 
    56     src/c_models/ellipsoid.cpp 
    57     src/c_models/lorentzian.cpp 
    58     src/c_models/rpa.cpp 
    59     src/c_models/gaussian.cpp 
    60     src/c_models/sc.cpp 
    61     src/c_models/DiamCyl.cpp 
    62     src/c_models/flexiblecylinder.cpp 
     63    src/c_models/vesicle.cpp 
     64    src/libigor/GaussWeights.c 
     65    src/libigor/libCylinder.c 
     66    src/libigor/libSphere.c 
    6367    src/libigor/libStructureFactor.c 
    64     src/libigor/libCylinder.c 
    65     src/libigor/GaussWeights.c 
    6668    src/libigor/libTwoPhase.c 
    67     src/libigor/libSphere.c 
    6869    ) 
    6970 
    7071set ( INC_FILES 
     72    src/c_models/dispersion_visitor.hh 
    7173    src/c_models/gamma_win.h 
    7274    src/c_models/parameters.hh 
    73     src/c_models/dispersion_visitor.hh 
    74     include/sphere.h 
     75    include/barbell.h 
     76    include/bcc.h 
     77    include/binaryHS.h 
     78    include/capcyl.h 
     79    include/core_shell.h 
     80    include/core_shell_cylinder.h 
     81    include/corefourshell.h 
     82    include/csparallelepiped.h 
     83    include/cylinder.h 
     84    include/DiamCyl.h 
     85    include/DiamEllip.h 
     86    include/ellipsoid.h 
     87    include/elliptical_cylinder.h 
     88    include/fcc.h 
     89    include/flexcyl_ellipX.h 
     90    include/flexible_cylinder.h 
     91    include/fractal.h 
     92    include/fuzzysphere.h 
     93    include/gaussian.h 
     94    include/Hardsphere.h 
     95    include/HayterMSA.h 
    7596    include/hollow_cylinder.h 
    76     include/binaryHS.h 
     97    include/lamellar.h 
     98    include/lamellarFF_HG.h 
     99    include/lamellarPC.h 
     100    include/lamellarPS.h 
     101    include/lamellarPS_HG.h 
     102    include/logNormal.h 
     103    include/lorentzian.h 
    77104    include/multishell.h 
    78     include/sc.h 
    79     include/StickyHS.h 
    80     include/vesicle.h 
    81     include/flexible_cylinder.h 
    82     include/csparallelepiped.h 
    83     include/flexcyl_ellipX.h 
    84     include/gaussian.h 
    85     include/lamellarPC.h 
    86     include/ellipsoid.h 
    87     include/stacked_disks.h 
    88     include/SquareWell.h 
    89     include/lamellarFF_HG.h 
    90     include/lamellarPS_HG.h 
    91     include/lorentzian.h 
    92     include/fractal.h 
    93     include/lamellarPS.h 
    94     include/cylinder.h 
    95     include/elliptical_cylinder.h 
    96     include/schulz.h 
    97     include/Hardsphere.h 
    98     include/refl_adv.h 
    99     include/barbell.h 
    100     include/spheresld.h 
     105    include/onion.h 
    101106    include/parallelepiped.h 
    102107    include/pearlnecklace.h 
     108    include/polygausscoil.h 
     109    include/refl.h 
     110    include/refl_adv.h 
     111    include/rpa.h 
     112    include/sc.h 
     113    include/schulz.h 
    103114    include/sld_cal.h 
    104     include/logNormal.h 
     115    include/sphere.h 
     116    include/spheresld.h 
    105117    include/spheroid.h 
    106     include/HayterMSA.h 
    107     include/polygausscoil.h 
    108     include/corefourshell.h 
    109     include/fcc.h 
     118    include/SquareWell.h 
     119    include/stacked_disks.h 
     120    include/StickyHS.h 
    110121    include/triaxial_ellipsoid.h 
    111     include/capcyl.h 
    112     include/DiamCyl.h 
    113     include/onion.h 
    114     include/bcc.h 
    115     include/core_shell_cylinder.h 
    116     include/lamellar.h 
    117     include/rpa.h 
    118     include/core_shell.h 
    119     include/fuzzysphere.h 
    120     include/refl.h 
    121     include/DiamEllip.h 
     122    include/vesicle.h 
    122123    src/libigor/GaussWeights.h 
     124    src/libigor/libCylinder.h 
    123125    src/libigor/libSANSAnalysis.h 
    124     src/libigor/StandardHeaders.h 
    125     src/libigor/libTwoPhase.h 
    126     src/libigor/winFuncs.h 
    127     src/libigor/libCylinder.h 
    128126    src/libigor/libSphere.h 
    129127    src/libigor/libStructureFactor.h 
     128    src/libigor/libTwoPhase.h 
     129    src/libigor/StandardHeaders.h 
     130    src/libigor/winFuncs.h 
    130131 
    131132) 
    … …  
    134135 
    135136# Add the target for this directory 
    136 add_library ( Models ${SRC_FILES} ${INC_FILES}) 
     137add_library ( models ${SRC_FILES} ${INC_FILES}) 
     138add_executable( libraryTest test/library_test.cpp  ${INC_FILES}) 
     139ADD_DEFINITIONS(-D__MODELS_STANDALONE__) 
     140ADD_DEPENDENCIES(libraryTest models) 
     141TARGET_LINK_LIBRARIES(libraryTest models) 

  • sansmodels/generate_cmake.py

    r503a972 r62dc94b  
    2626               "src/libigor"] 
    2727excluded_src = ["c_models.cpp", 
    28                 "dispersion_visitor.cpp", 
    2928                "disperser.c", 
    3029                "winFuncs.c"] 
    … …  
    5857 
    5958# Add the target for this directory 
    60 add_library ( Models ${SRC_FILES} ${INC_FILES}) 
     59add_library ( models ${SRC_FILES} ${INC_FILES}) 
     60add_executable( libraryTest test/library_test.cpp  ${INC_FILES}) 
     61ADD_DEFINITIONS(-D__MODELS_STANDALONE__) 
     62ADD_DEPENDENCIES(libraryTest models) 
     63TARGET_LINK_LIBRARIES(libraryTest models) 
    6164""" 
    6265 
Note: See TracChangeset for help on using the changeset viewer.