Permalink
Browse files
Fixed name testing filename bugs
- Loading branch information...
Showing
with
16 additions
and
352 deletions.
-
+0
−1
mloop/controllers.py
-
+4
−4
mloop/interfaces.py
-
+5
−4
mloop/testing.py
-
+5
−0
mloop/utilities.py
-
+0
−341
runController.py
-
+2
−2
setup.py
|
|
@@ -13,7 +13,6 @@ |
|
|
|
|
|
controller_dict = {'random':1,'nelder_mead':2,'gaussian_process':3}
|
|
|
number_of_controllers = 3
|
|
|
-
|
|
|
default_controller_archive_filename = 'controller_archive'
|
|
|
|
|
|
class ControllerInterrupt(Exception):
|
|
|
|
|
|
@@ -135,10 +135,10 @@ class FileInterface(Interface): |
|
|
'''
|
|
|
|
|
|
def __init__(self,
|
|
|
- out_filename='exp_input',
|
|
|
- out_file_type='mat',
|
|
|
- in_filename='exp_output',
|
|
|
- in_file_type='mat',
|
|
|
+ out_filename=mlu.default_out_filename,
|
|
|
+ out_file_type=mlu.default_out_file_type,
|
|
|
+ in_filename=mlu.default_in_filename,
|
|
|
+ in_file_type=mlu.default_in_file_type,
|
|
|
**kwargs):
|
|
|
|
|
|
super().__init__(**kwargs)
|
|
|
|
|
|
@@ -172,8 +172,8 @@ class FakeExperiment(threading.Thread): |
|
|
|
|
|
def __init__(self,
|
|
|
test_landscape = None,
|
|
|
- out_file_type='mat',
|
|
|
- in_file_type='mat',
|
|
|
+ out_file_type=mlu.default_in_file_type,
|
|
|
+ in_file_type=mlu.default_out_file_type,
|
|
|
exp_wait = 0,
|
|
|
poll_wait = 1,
|
|
|
**kwargs):
|
|
|
@@ -190,8 +190,9 @@ def __init__(self, |
|
|
self.poll_wait = float(poll_wait)
|
|
|
self.out_file_type = str(out_file_type)
|
|
|
self.in_file_type = str(in_file_type)
|
|
|
- self.total_out_filename = 'ExpOutput.' + self.out_file_type
|
|
|
- self.total_in_filename = 'ExpInput.' + self.in_file_type
|
|
|
+
|
|
|
+ self.total_out_filename = mlu.default_in_filename + '.' + self.out_file_type
|
|
|
+ self.total_in_filename = mlu.default_out_filename + '.' + self.in_file_type
|
|
|
self.end_event = threading.Event()
|
|
|
self.test_count =0
|
|
|
|
|
|
|
|
|
@@ -11,6 +11,11 @@ |
|
|
import numpy as np
|
|
|
import mloop
|
|
|
|
|
|
+default_in_filename = 'exp_output'
|
|
|
+default_in_file_type = 'mat'
|
|
|
+default_out_filename = 'exp_input'
|
|
|
+default_out_file_type = 'mat'
|
|
|
+
|
|
|
archive_foldername = './M-LOOP_archives/'
|
|
|
log_foldername = './M-LOOP_logs/'
|
|
|
default_log_filename = 'M-LOOP_'
|
|
|
|
Oops, something went wrong.
0 comments on commit
601b482