Changeset a7db39fa in sasmodels


Ignore:
Timestamp:
Mar 28, 2019 8:10:37 AM (5 years ago)
Author:
ajj
Branches:
master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests
Children:
6dccecc
Parents:
facb052
Message:

Fixing model tests to properly handle P*S tests

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/direct_model.py

    rfacb052 ra7db39fa  
    5959    """ 
    6060    mesh = get_mesh(calculator.info, pars, dim=calculator.dim, mono=mono) 
    61     print("in call_kernel: pars:", list(zip(*mesh))[0]) 
     61    #print("in call_kernel: pars:", list(zip(*mesh))[0]) 
    6262    call_details, values, is_magnetic = make_kernel_args(calculator, mesh) 
    6363    #print("in call_kernel: values:", values) 
     
    118118        active = lambda name: True 
    119119 
    120     print("in get_mesh: pars:",[p.id for p in parameters.call_parameters]) 
     120    #print("in get_mesh: pars:",[p.id for p in parameters.call_parameters]) 
    121121    mesh = [_get_par_weights(p, values, active(p.name)) 
    122122            for p in parameters.call_parameters] 
  • sasmodels/model_test.py

    rfacb052 ra7db39fa  
    240240                    s_name = pars.pop('@S') 
    241241                    ps_test = [pars] + list(test[1:]) 
     242                    #print("PS TEST PARAMS!!!",ps_test) 
    242243                    # build the P@S model 
    243244                    s_info = load_model_info(s_name) 
    244                     print("in run_all: s_info:", s_info) 
    245245                    ps_info = product.make_product_info(self.info, s_info) 
    246246                    ps_model = build_model(ps_info, dtype=self.dtype, 
    247247                                           platform=self.platform) 
    248248                    # run the tests 
     249                    self.info = ps_model.info 
     250                    #print("SELF.INFO PARAMS!!!",[p.id for p in self.info.parameters.call_parameters]) 
     251                    #print("PS MODEL PARAMETERS:",[p.id for p in ps_model.info.parameters.call_parameters]) 
    249252                    results.append(self.run_one(ps_model, ps_test)) 
    250253 
     
    397400        if par == product.STRUCTURE_MODE_ID: 
    398401            continue 
    399         if par == "radius_effective":    # test should not need this?? 
    400             continue 
    401402        parts = par.split('_pd') 
    402403        if len(parts) > 1 and parts[1] not in ("", "_n", "nsigma", "type"): 
     
    414415    """ 
    415416    import math 
    416     shift = 10**math.ceil(math.log10(abs(target))) 
    417     return abs(target-actual)/shift < 1.5*10**-digits 
     417    shift = 10**math.ceil(math.log10(np.abs(target))) 
     418    return np.abs(target-actual)/shift < 1.5*10**-digits 
    418419 
    419420# CRUFT: old interface; should be deprecated and removed 
Note: See TracChangeset for help on using the changeset viewer.