Changeset e922c5d in sasmodels


Ignore:
Timestamp:
Nov 22, 2015 9:58:04 PM (9 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
87e70a3
Parents:
3b4243d
Message:

move compare/compare_many into sasmodels package

Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • compare.sh

    r648393e re922c5d  
    99set -x 
    1010 
    11 ./compare.py $* 
     11python -m sasmodels.compare $* 
  • compare_many.sh

    r7cf2cfd re922c5d  
    77#echo PYTHONPATH=$PYTHONPATH 
    88 
    9 ./compare_many.py $* 
     9python -m sasmodels.compare_many $* 
    1010 
    1111#for dim in 1d100 2d32; do 
    12 #    ./compare_many.py all 100 $dim 0 > ${dim}_poly_0.csv 
    13 #    ./compare_many.py all 100 $dim 1e-5 > ${dim}_poly_1e-5.csv 
    14 #    ./compare_many.py all 100 $dim 1e-3 > ${dim}_poly_1e-3.csv 
    15 #    ./compare_many.py all 100 $dim mono > ${dim}_mono.csv 
     12#    python -m sasmodels.compare_many all 100 $dim 0 > ${dim}_poly_0.csv 
     13#    python -m sasmodels.compare_many all 100 $dim 1e-5 > ${dim}_poly_1e-5.csv 
     14#    python -m sasmodels.compare_many all 100 $dim 1e-3 > ${dim}_poly_1e-3.csv 
     15#    python -m sasmodels.compare_many all 100 $dim mono > ${dim}_mono.csv 
    1616#done 
    1717 
  • sasmodels/compare.py

    r7cf2cfd re922c5d  
    1414 
    1515 
    16 from sasmodels import core 
    17 from sasmodels import kerneldll 
    18 from sasmodels.data import plot_theory, empty_data1D, empty_data2D 
    19 from sasmodels.direct_model import DirectModel 
    20 from sasmodels.convert import revert_model 
     16from . import core 
     17from . import kerneldll 
     18from . import models 
     19from .data import plot_theory, empty_data1D, empty_data2D 
     20from .direct_model import DirectModel 
     21from .convert import revert_model 
    2122kerneldll.ALLOW_SINGLE_PRECISION_DLLS = True 
    2223 
    2324# List of available models 
    2425MODELS = [basename(f)[:-3] 
    25           for f in sorted(glob.glob(joinpath(ROOT,"sasmodels","models","[a-zA-Z]*.py")))] 
     26          for f in sorted(glob.glob(joinpath(ROOT,"models","[a-zA-Z]*.py")))] 
    2627 
    2728# CRUFT python 2.6 
     
    396397 
    397398def get_demo_pars(name): 
    398     import sasmodels.models 
    399399    __import__('sasmodels.models.'+name) 
    400     model = getattr(sasmodels.models, name) 
     400    model = getattr(models, name) 
    401401    pars = getattr(model, 'demo', None) 
    402402    if pars is None: pars = dict((p[0],p[2]) for p in model.parameters) 
  • sasmodels/compare_many.py

    r7cf2cfd re922c5d  
    55import numpy as np 
    66 
    7 from sasmodels import core 
    8 from sasmodels.kernelcl import environment 
    9 from compare import (MODELS, randomize_model, suppress_pd, eval_sasview, 
    10                      eval_opencl, eval_ctypes, make_data, get_demo_pars, 
    11                      columnize) 
     7from . import core 
     8from .kernelcl import environment 
     9from .compare import (MODELS, randomize_model, suppress_pd, eval_sasview, 
     10                      eval_opencl, eval_ctypes, make_data, get_demo_pars, 
     11                      columnize) 
    1212 
    1313def get_stats(target, value, index): 
Note: See TracChangeset for help on using the changeset viewer.