Merge pull request #392 from capocchi/version-5.1

Version 5.1

Author: capocchi

devsimpy/DEVSKernel/BrokerDEVS/DEVSStreaming/SimStrategyMqttMS4Me.py

@@ -498,7 +498,7 @@ def _simulate_for_ms4me(self, T=1e8):
             while self.ts.Get() < T and not self._simulator.end_flag:
                 iteration += 1
 
-                if tmin == float("inf"):
+                if tmin == INFINITY:
                     logger.info("No more events - simulation complete")
                     break
                 if tmin > T:
@@ -660,7 +660,7 @@ def _simulate_for_ms4me(self, T=1e8):
                 for model in self._atomic_models:
                     if model not in td_int and model not in td_ext:
                         all_next_times.append(model.timeNext)
-                tmin = min(all_next_times) if all_next_times else float("inf")
+                tmin = min(all_next_times) if all_next_times else INFINITY
 
                 # Update progress
                 cpu_time = time.time() - t_start

devsimpy/DEVSKernel/BrokerDEVS/simulation_config.py

@@ -217,7 +217,7 @@ def _get_default_port(broker_type: str) -> int:
 
 
 def auto_configure_simulation(
-    standard: str = "ms4me",
+    standard: str = "devs-streaming",
     broker: Optional[str] = None,
     host: Optional[str] = None,
     port: Optional[int] = None,
@@ -227,7 +227,7 @@ def auto_configure_simulation(
     Auto-configure simulation with sensible defaults.
     
     Args:
-        standard: Message standard to use (default: ms4me)
+        standard: Message standard to use (default: devs-streaming)
         broker: Broker type (kafka, mqtt, rabbitmq)
         host: Broker host
         port: Broker port
@@ -245,7 +245,7 @@ def auto_configure_simulation(
         
         # Fully manual
         config = auto_configure_simulation(
-            standard='ms4me',
+            standard='devs-streaming',
             broker='mqtt',
             host='broker.example.com',
             port=1883

devsimpy/Menu.py

@@ -1011,7 +1011,7 @@ def __init__(self, shape, event):
 		disable=wx.MenuItem(self, ID_DISABLE_SHAPE, _("Disable"), _("Disable the link for the simulation"))
 		export=wx.MenuItem(self, ID_EXPORT_SHAPE, _("Export"), _("Export the model"))
 		exportAMD=wx.MenuItem(self, ID_EXPORT_AMD_SHAPE, _("AMD"), _("Model exported to a amd file"))
-		exportKAFKA_WORKER=wx.MenuItem(self, ID_EXPORT_KAFKA_WORKER_PKG, _("Kafka Worker"), _("Model exported as a standalone package runnable with a Kafka-based simulator."))
+		exportKAFKA_WORKER=wx.MenuItem(self, ID_EXPORT_KAFKA_WORKER_PKG, _("Broker Worker"), _("Model exported as a standalone package runnable with a Kafka-based simulator."))
 		exportCMD=wx.MenuItem(self, ID_EXPORT_CMD_SHAPE, _("CMD"), _("Model exported to a cmd file"))
 		exportXML=wx.MenuItem(self, ID_EXPORT_XML_SHAPE, _("XML"), _("Model exported to a xml file"))
 		exportJS=wx.MenuItem(self, ID_EXPORT_JS_SHAPE, _("JS"), _("Model exported to a js (join) file"))
@@ -1148,15 +1148,22 @@ def __init__(self, shape, event):
 			if isinstance(shape, Container.CodeBlock):
 				AppendMenu(self, -1, _("Export"), export_subMenu)
 				Export_SubMenu1 = export_subMenu.Append(exportAMD)
+				Export_SubMenu2 = export_subMenu.Append(exportKAFKA_WORKER)
 				self.AppendSeparator()
 
-				if DEFAULT_DEVS_DIRNAME == "BrokerDEVS":
-					print("eeee")
-					if shape.isPY():
-						### TODO : impelmented but not tested for AMD model
-						Export_SubMenu2 = export_subMenu.Append(exportKAFKA_WORKER)
-
-				if shape.isPYC():
+				
+				if shape.isPY():
+					if DEFAULT_DEVS_DIRNAME != "BrokerDEVS":
+						Export_SubMenu2.Enable(False)
+
+				elif shape.isAMD():
+					if DEFAULT_DEVS_DIRNAME != "BrokerDEVS":
+						Export_SubMenu2.Enable(False)
+					else:
+						### TODO: need to be implemented
+						Export_SubMenu2.Enable(False)
+
+				elif shape.isPYC():
 					Export_SubMenu1.Enable(False)