Commit e3a167e5 authored by Heller, William T.'s avatar Heller, William T.
Browse files

Merge branch 'manuscript_revs' into 'master' 

manuscript revisions

See merge request !28
parents d2d637d4 04e76ab2

CONTRIBUTING.rst

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Guide to Contributing

=====================



You are welcome to contribute to this project.  Contributors to this project agree

to the following conditions:

(1) Contributors have permission and all required rights to their submitted contribution.

(2) Contributions are provided under the license of this project and may be redistributed under the same license.

(3) All contributions made to this project are public.



Contributions made must be "signed off" in the commit log.  By signinig off on your contribution,

you are agreeing to the conditions stated above.  



Obtaining Access to the Main Project

------------------------------------

Only core developers have direct commit access.

Other contributors should use pull requests for their contributions.



Contacting the Development Team

-------------------------------

The preferred mechanism for contacting the developement team is to open a ticket.

Alternatively, the core development team may be contacted by email.



William Heller:  hellerwt_at_ornl DOT gov



Mathieu Doucet:  doucetm_at_ornl DOT gov



Rick Archibald:  archibaldrk_at_ornl DOT gov

sas_temper/sas_temper_engine.py

+5 −0
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ def sa_engine(fconf, modconf, d): 
    schedule = 1

    hit = False

    while schedule <= fconf.temperatures:

        

        # add a little feedback to the user 

        if ((schedule+1) % 10==0):

            print('#', end='', flush=True)



        iters = 1

        

        while iters <= fconf.iterations:

scripts/sas-temper

+11 −7
Original line number Diff line number Diff line
@@ -47,27 +47,31 @@ models_usm = np.empty(sasTemperConf.models, "object") 
# seed the random number generator

np.random.seed(int(tm.time()) + int(os.getpid()))



# add a little feedback to the user

print('model started:', end='', flush=True)





# this loop creates the set of models

for i in range(0,sasTemperConf.models):

    # add a little feedback to the user

    feedbk = "model %d of %d started: " %(i+1, sasTemperConf.models)

    

    print(str(feedbk), end='', flush=True)

    

    results[i], models[i], models_usm[i] = engine.sa_control(sasTemperConf,modelConf,experimentalData)



    #output the results of the single fitting

    output.outputSingleRes(sasTemperConf, experimentalData, models[i], i, results[i])

    

    # add a little feedback to the user

    if ((i+1) % 10==0):

        print('#', end='', flush=True)

    print(" done")





# and output the analysis of the set of models found,

# but only if you are generating more than 3 models.

# much of the information is of little use otherwise.

if sasTemperConf.models >=3 :

    print("Performing the analysis of the set of results")

    

    output.outputSetRes(sasTemperConf, results)

    

# add a little feedback to the user

print(" done")