Ignore:
Timestamp:
Sep 8, 2017 5:56:57 PM (4 years ago)
Author:
toby
Message:

more work on constraints: prevent use of perviously constrained variables in new equivalences; include sym. generated constraints in checks; do not allow error-generating constraints to be added

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIImapvars.py

    r3056 r3057  
    235235symGenList = [] # Flag if constraint is generated by symmetry
    236236problemVars = [] # variables causing errors
     237dependentVars = []
     238independentVars = []
    237239
    238240# prefix for parameter names
     
    520522                errmsg += _FormatConstraint(constrDict[rel],fixedList[rel])
    521523                errmsg += "\n"
     524    _setVarLists([])
    522525    return errmsg,warnmsg
    523526
     
    765768        if fixedval:
    766769            fixedDict[fixedval] = float(fixedval)
    767 
    768     # make list of dependent and independent variables (after dropping unused)
     770    _setVarLists(dropVarList)
     771   
     772def _setVarLists(dropVarList):
     773    '''Make list of dependent and independent variables (after dropping unused vars in dropVarList)
     774    '''
     775    global dependentParmList,indParmList
    769776    global dependentVars
    770777    global independentVars
Note: See TracChangeset for help on using the changeset viewer.