mg-pso-gui 0.2.38__tar.gz → 0.2.39__tar.gz

{mg_pso_gui-0.2.38 → mg_pso_gui-0.2.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.2.38
+Version: 0.2.39
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.2.38 → mg_pso_gui-0.2.39}/mg_pso_gui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.2.38
+Version: 0.2.39
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

mg_pso_gui-0.2.39/mgpsogui/gui/defaults/optimization.json

@@ -0,0 +1,176 @@
+{
+"model_parameters": [
+    {
+        "name": "startTime",
+        "value": "2002-01-01",
+        "type": "date",
+        "destination": "args"
+    },
+    {
+        "name": "endTime",
+        "value": "2006-12-31",
+        "type": "date",
+        "destination": "args"
+    },
+    {
+        "name": "dataStartTime",
+        "value": "2002-01-01",
+        "type": "date",
+        "destination": "args"
+    },
+    {
+        "name": "dataEndTime",
+        "value": "2006-12-31",
+        "type": "date",
+        "destination": "args"
+    },
+    {
+        "name": "cal_startTime",
+        "value": "2003-01-01",
+        "type": "date",
+        "destination": "args"
+    },
+    {
+        "name": "cal_endTime",
+        "value": "2006-12-31",
+        "type": "date",
+        "destination": "args"
+    },
+    {
+        "name": "parallelismThreads",
+        "value": "2",
+        "type": "integer",
+        "destination": "args"
+    },
+    {
+        "name": "flagLoadState",
+        "value": "True",
+        "type": "boolean",
+        "destination": "args"
+    },
+    {
+        "name": "payload",
+        "value": "False",
+        "type": "boolean",
+        "destination": "args"
+    },
+    {
+        "name": "project",
+        "value": "SFIR3",
+        "type": "string",
+        "destination": "args"
+    }
+],
+"hyperparameters": [
+    {
+        "name": "min_rounds",
+        "value": "1",
+        "type": "integer",
+        "destination": "kwargs"
+    },
+    {
+        "name": "max_rounds",
+        "value": "2",
+        "type": "integer",
+        "destination": "kwargs"
+    },
+    {
+        "name": "n_particles",
+        "value": "10",
+        "type": "integer",
+        "destination": "kwargs"
+    },
+    {
+        "name": "iters",
+        "value": "20",
+        "type": "integer",
+        "destination": "kwargs"
+    },
+    {
+        "name": "n_threads",
+        "value": "10",
+        "type": "integer",
+        "destination": "kwargs"
+    },
+    {
+        "name": "options_c1",
+        "value": "2",
+        "type": "float",
+        "destination": "options"
+    },
+    {
+        "name": "options_c2",
+        "value": "2",
+        "type": "float",
+        "destination": "options"
+    },
+    {
+        "name": "options_w",
+        "value": "0.8",
+        "type": "float",
+        "destination": "options"
+    },
+    {
+        "name": "strategy_w",
+        "value": "adaptive",
+        "type": "string",
+        "destination": "oh_strategy"
+    },
+    {
+        "name": "strategy_c1",
+        "value": "adaptive",
+        "type": "string",
+        "destination": "oh_strategy"
+    },
+    {
+        "name": "strategy_c2",
+        "value": "adaptive",
+        "type": "string",
+        "destination": "oh_strategy"
+    }
+],
+"service_parameters": [
+    {
+        "name": "service_timeout",
+        "value": "400",
+        "type": "integer",
+        "destination": "conf"
+    },
+    {
+        "name": "http_retry",
+        "value": "5",
+        "type": "integer",
+        "destination": "conf"
+    },
+    {
+        "name": "allow_redirects",
+        "value": "True",
+        "type": "boolean",
+        "destination": "conf"
+    },
+    {
+        "name": "async_call",
+        "value": "False",
+        "type": "boolean",
+        "destination": "conf"
+    },
+    {
+        "name": "conn_timeout",
+        "value": "10",
+        "type": "integer",
+        "destination": "conf"
+    },
+    {
+        "name": "read_timeout",
+        "value": "400",
+        "type": "integer",
+        "destination": "conf"
+    },
+    {
+        "name": "particles_fail",
+        "value": "5",
+        "type": "integer",
+        "destination": "conf"
+    }
+]
+}

mg_pso_gui-0.2.39/mgpsogui/gui/defaults/sampling.json

@@ -0,0 +1,111 @@
+{
+"model_parameters": [
+				{
+					"name": "startTime",
+					"value": "2011-06-08",
+					"type": "date",
+					"destination": "args"
+				},
+				{
+					"name": "endTime",
+					"value": "2011-07-13",
+					"type": "date",
+					"destination": "args"
+				},
+				{
+					"name": "dataStartTime",
+					"value": "2011-06-08",
+					"type": "date",
+					"destination": "args"
+				},
+				{
+					"name": "dataEndTime",
+					"value": "2011-07-13",
+					"type": "date",
+					"destination": "args"
+				},
+				{
+					"name": "parallelismThreads",
+					"value": "8",
+					"type": "integer",
+					"destination": "args"
+				},
+				{
+					"name": "flagLoadState",
+					"value": "True",
+					"type": "boolean",
+					"destination": "args"
+				},
+				{
+					"name": "payload",
+					"value": "False",
+					"type": "boolean",
+					"destination": "args"
+				},
+				{
+					"name": "project",
+					"value": "drake58hru-5min",
+					"type": "string",
+					"destination": "args"
+				},
+				{
+					"name": "offset",
+					"value": "5",
+					"type": "integer",
+					"destination": "kwargs"
+				},
+				{
+					"name": "count",
+					"value": "10",
+					"type": "integer",
+					"destination": "kwargs"
+				},
+				{
+					"name": "num_threads",
+					"value": "2",
+					"type": "integer",
+					"destination": "kwargs"
+				}
+			],
+			"hyperparameters": [
+
+			],
+			"service_parameters": [
+				{
+					"name": "service_timeout",
+					"value": "400",
+					"type": "integer",
+					"destination": "conf"
+				},
+				{
+					"name": "http_retry",
+					"value": "5",
+					"type": "integer",
+					"destination": "conf"
+				},
+				{
+					"name": "allow_redirects",
+					"value": "True",
+					"type": "boolean",
+					"destination": "conf"
+				},
+				{
+					"name": "async_call",
+					"value": "False",
+					"type": "boolean",
+					"destination": "conf"
+				},
+				{
+					"name": "conn_timeout",
+					"value": "10",
+					"type": "integer",
+					"destination": "conf"
+				},
+				{
+					"name": "read_timeout",
+					"value": "400",
+					"type": "integer",
+					"destination": "conf"
+				}
+			]
+        }

{mg_pso_gui-0.2.38 → mg_pso_gui-0.2.39}/mgpsogui/gui/defaults/sensitivity.json

@@ -8,13 +8,13 @@
             "name": "service_timeout",
             "value": "60",
             "type": "integer",
-            "destination": "calibration_parameters"
+            "destination": "conf"
         },
         {
             "name": "mode",
             "value": "async",
             "type": "string",
-            "destination": "calibration_parameters"
+            "destination": "conf"
         }
     ]
 }

{mg_pso_gui-0.2.38 → mg_pso_gui-0.2.39}/mgpsogui/util/PSORunner.py

@@ -232,6 +232,15 @@ def run_sampling(data, mode, folder, results_queue):
 
     config['step_trace'] = os.path.join(folder, 'pso_step_trace.json')
 
+    print("Parsing Parameters...\n", flush=True)
+    print("steps: ", output_steps, flush=True)
+    print("args: ", args, flush=True)
+    print("options: ", options, flush=True)
+    print("oh_strategy: ", oh_strategy, flush=True)
+    print("config: ", config, flush=True)
+    print("metainfo: ", metainfo, flush=True)
+    print("kwargs: ", parameter_map, flush=True)
+
     print("Running Sampling..\n", flush=True)
     trace = run_sampler(output_steps, 
                         args, 
@@ -273,6 +282,15 @@ def run_optimization(data, folder, results_queue):
 
     config['step_trace'] = os.path.join(folder, 'pso_step_trace.json')
 
+    print("Parsing Parameters...\n", flush=True)
+    print("steps: ", output_steps, flush=True)
+    print("args: ", args, flush=True)
+    print("options: ", options, flush=True)
+    print("oh_strategy: ", oh_strategy, flush=True)
+    print("config: ", config, flush=True)
+    print("metainfo: ", metainfo, flush=True)
+    print("kwargs: ", parameter_map, flush=True)
+
     print("Running MG-PSO Optimization...\n", flush=True)
     optimizer, trace = global_best(output_steps,   
             rounds=(int(pp('min_rounds', parameter_map)), int(pp('max_rounds', parameter_map))),              

{mg_pso_gui-0.2.38 → mg_pso_gui-0.2.39}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.2.38'
+VERSION = '0.2.39'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()
 

mg_pso_gui-0.2.38/mgpsogui/gui/defaults/optimization.json

@@ -1,183 +0,0 @@
-{
-    "model_parameters": [
-        {
-            "name": "startTime",
-            "value": "2002-01-01",
-            "type": "date",
-            "destination": "param"
-            
-        },
-        {
-            "name": "endTime",
-            "value": "2006-12-31",
-            "type": "date",
-            "destination": "param"
-        },
-        {
-            "name": "dataStartTime",
-            "value": "2002-01-01",
-            "type": "date",
-            "destination": "param"
-        },
-        {
-            "name": "dataEndTime",
-            "value": "2006-12-31",
-            "type": "date",
-            "destination": "param"
-        },
-        {
-            "name": "cal_startTime",
-            "value": "2003-01-01",
-            "type": "date",
-            "destination": "param"
-        },
-        {
-            "name": "cal_endTime",
-            "value": "2006-12-31",
-            "type": "date",
-            "destination": "param"
-        },
-        {
-            "name": "parallelismThreads",
-            "value": "2",
-            "type": "integer",
-            "destination": "param"
-        },
-        {
-            "name": "flagLoadState",
-            "value": "True",
-            "type": "boolean",
-            "destination": "param"
-        },
-        {
-            "name": "payload",
-            "value": "False",
-            "type": "boolean",
-            "destination": "param"
-        },
-        {
-            "name": "project",
-            "value": "SFIR3",
-            "type": "string",
-            "destination": "param"
-        }
-    ],
-    "hyperparameters": [
-        {
-            "name": "min_rounds",
-            "value": "1",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "max_rounds",
-            "value": "2",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "n_particles",
-            "value": "10",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "iters",
-            "value": "20",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "n_threads",
-            "value": "10",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "ftol",
-            "value": "NULL",
-            "type": "float",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "options_c1",
-            "value": "2",
-            "type": "float",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "options_c2",
-            "value": "2",
-            "type": "float",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "options_w",
-            "value": "0.8",
-            "type": "float",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "strategy_w",
-            "value": "adaptive",
-            "type": "string",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "strategy_c1",
-            "value": "adaptive",
-            "type": "string",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "strategy_c2",
-            "value": "adaptive",
-            "type": "string",
-            "destination": "calibration_parameters"
-        }
-    ],
-    "service_parameters": [
-        {
-            "name": "service_timeout",
-            "value": "400",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "http_retry",
-            "value": "5",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "allow_redirects",
-            "value": "True",
-            "type": "boolean",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "async_call",
-            "value": "False",
-            "type": "boolean",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "conn_timeout",
-            "value": "10",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "read_timeout",
-            "value": "400",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "particles_fail",
-            "value": "5",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        }
-    ]
-}

mg_pso_gui-0.2.38/mgpsogui/gui/defaults/sampling.json

@@ -1,110 +0,0 @@
-{
-    "model_parameters": [
-        {
-            "name": "startTime",
-            "value": "2011-06-08",
-            "type": "date",
-            "destination": "param"
-        },
-        {
-            "name": "endTime",
-            "value": "2011-07-13",
-            "type": "date",
-            "destination": "param"
-        },
-        {
-            "name": "dataStartTime",
-            "value": "2011-06-08",
-            "type": "date",
-            "destination": "param"
-        },
-        {
-            "name": "dataEndTime",
-            "value": "2011-07-13",
-            "type": "date",
-            "destination": "param"
-        },
-        {
-            "name": "parallelismThreads",
-            "value": "8",
-            "type": "integer",
-            "destination": "param"
-        },
-        {
-            "name": "flagLoadState",
-            "value": "True",
-            "type": "boolean",
-            "destination": "param"
-        },
-        {
-            "name": "payload",
-            "value": "False",
-            "type": "boolean",
-            "destination": "param"
-        },
-        {
-            "name": "project",
-            "value": "drake58hru-5min",
-            "type": "string",
-            "destination": "param"
-        }, 
-        {
-            "name": "offset",
-            "value": "5",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "count",
-            "value": "10",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "num_threads",
-            "value": "2",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        }
-    ],
-    "hyperparameters": [
-    ],
-    "service_parameters": [
-        {
-            "name": "service_timeout",
-            "value": "400",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "http_retry",
-            "value": "5",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "allow_redirects",
-            "value": "True",
-            "type": "boolean",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "async_call",
-            "value": "False",
-            "type": "boolean",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "conn_timeout",
-            "value": "10",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        },
-        {
-            "name": "read_timeout",
-            "value": "400",
-            "type": "integer",
-            "destination": "calibration_parameters"
-        }
-    ]
-}