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

Replace sas_temper_engine.py

parent f30bde74

sas_temper/sas_temper_engine.py

+39 −38
Original line number Diff line number Diff line
@@ -90,9 +90,11 @@ def sa_engine(fconf, modconf, d): 
    temp = 10.0

    r = 1.0

    schedule = 1

    iters = 1

    hit = False

    while schedule <= fconf.temperatures:

		iters = 1

		

		while iters <= fconf.iterations:

			#define the model to test

			f = define_model(schedule,modconf,temp,r,cur)
@@ -130,7 +132,6 @@ def sa_engine(fconf, modconf, d): 
			iters += 1

        

        # we drop the temperature, tighten the range and increase schedule

        if iters % fconf.iterations :

        temp = temp*fconf.temp_rate

        r = r*fconf.param_rate

        schedule += 1