diff --git a/script/Alignment/Optimization_search.py b/script/Alignment/Optimization_search.py index a1af581..7433834 100644 --- a/script/Alignment/Optimization_search.py +++ b/script/Alignment/Optimization_search.py @@ -6,7 +6,6 @@ add_device(CamTool("image_stats", prefix = "SINEG01-DSCR190:", latch = True, ca image_stats.start() image_stats.setNumberOfImages(5) - laser_off() image_stats.captureBackground(10) laser_on() @@ -20,8 +19,9 @@ def before_sample(): class FitnessFunction(ReadonlyRegisterBase): def doRead(self): r = lscan(gun_solenoid, [image_stats.com_x_mean, image_stats.com_y_mean] , 110.0, 120.0, 1.0, 0.1, before_read = before_sample) - return 1000.0 - (math.pow(ao1.take()-18, 2) + math.pow(ao2.take()-6, 2)) - + bounding_area = abs(max(r.getReadable(0)) - min(r.getReadable(0))) * abs(max(r.getReadable(1)) - min(r.getReadable(1))) + return bounding_area + add_device(FitnessFunction("fitness"), True) @@ -38,7 +38,9 @@ print len(r.getRecords()) """ #Hill Climbing Search -r = hsearch([gsx, gsy, gsrx, gsry], fitness,[-1.0,-1.0,-1.0,-1.0], [1.0,1.0,1.0,1.0], [0.1, 0.1, 0.1, 0.1], [0.01, 0.01, 0.01, 0.01], 3, relative = False, maximum=False, latency = 0.01, title = "Hill Climbing") +#r = hsearch([gsx, gsy, gsrx, gsry], fitness,[-1.0,-1.0,-1.0,-1.0], [1.0,1.0,1.0,1.0], [0.1, 0.1, 0.1, 0.1], [0.01, 0.01, 0.01, 0.01], 3, relative = False, maximum=False, latency = 0.01, title = "Hill Climbing") +r = hsearch([gsrx, gsry], fitness,[-1.0,-1.0], [1.0,1.0], [ 0.1, 0.1], [0.01, 0.01], 3, relative = False, maximum=False, latency = 0.01, title = "Hill Climbing") + print "--------------- Hill Climbing Search -----------------" print r print r.print()