Creation of Mechanical Ventilator equipment to C++, Java, C# (Not yet in Python)

Rework equipment actions hierarchy to a single equipment action collection, updated all equipment scenarios Updated Scenarios protoc generation script fixes

Creation of Mechanical Ventilator equipment to C++, Java, C# (Not yet in Python)
Rework equipment actions hierarchy to a single equipment action collection, updated all equipment scenarios Updated Scenarios protoc generation script fixes
f21a789d · Aaron Bray · 0db1453b · f21a789d · f21a789d · f21a789d
Commit f21a789d authored Mar 31, 2020 by Aaron Bray
--- a/bin/run.cmake.in
+++ b/bin/run.cmake.in
@@ -103,8 +103,13 @@ elseif(TYPE STREQUAL "doxygen")
  setup_landing_page(pulse-in-action.html)
  setup_landing_page(news.html)
 elseif(TYPE STREQUAL "protoc")
-  file(REMOVE @SCHEMA_DST@/schema_last_built)
-  execute_process(COMMAND ${CMAKE_COMMAND} -DSRC_ROOT:PATH=@SRC_ROOT@ -DSCHEMA_SRC:STRING=@SCHEMA_SRC@ -Dprotobuf_SRC:PATH=@protobuf_SRC@ -Dprotobuf_DIR:PATH=@protobuf_DIR@ -P "@CMAKE_SOURCE_DIR@/schema/GenerateCDMBindings.cmake")
+  file(REMOVE @CMAKE_SOURCE_DIR@/src/schema/schema_last_built)
+  execute_process(COMMAND ${CMAKE_COMMAND} -DSRC_ROOT:PATH=@CMAKE_SOURCE_DIR@/src
+                                           -Dprotobuf_SRC:PATH=@protobuf_SRC@
+                                           -DProtobuf_PROTOC_EXECUTABLE:PATH=@Protobuf_PROTOC_EXECUTABLE@
+                                           -DPulse_JAVA_API:BOOL=@Pulse_JAVA_API@
+                                           -DPulse_PYTHON_API:BOOL=@Pulse_PYTHON_API@
+                                           -P "@CMAKE_SOURCE_DIR@/src/schema/GenerateBindings.cmake")
 elseif(TYPE STREQUAL "updateBaselines")
  execute_process(COMMAND ${CMAKE_COMMAND} --build "@CMAKE_CURRENT_BINARY_DIR@" --target UpdateVerification)
 elseif(TYPE STREQUAL "rebase")

--- a/data/human/adult/scenarios/combined/Cynthia.json
+++ b/data/human/adult/scenarios/combined/Cynthia.json
@@ -471,8 +471,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -503,7 +503,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 10.5,
              "Unit": "cmH2O"
@@ -607,8 +607,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Tube"
        }

--- a/data/human/adult/scenarios/combined/Gus.json
+++ b/data/human/adult/scenarios/combined/Gus.json
@@ -409,8 +409,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -440,7 +440,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Unit": "cmH2O"
            }
@@ -507,8 +507,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Tube",
          "InletFlow": {
@@ -539,7 +539,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 10.5,
              "Unit": "cmH2O"

--- a/data/human/adult/scenarios/combined/Hassan.json
+++ b/data/human/adult/scenarios/combined/Hassan.json
@@ -417,8 +417,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -448,7 +448,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Unit": "cmH2O"
            }
@@ -542,8 +542,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Tube",
          "InletFlow": {
@@ -574,7 +574,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 10.5,
              "Unit": "cmH2O"

--- a/data/human/adult/scenarios/combined/Joel.json
+++ b/data/human/adult/scenarios/combined/Joel.json
@@ -454,8 +454,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -485,7 +485,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Unit": "cmH2O"
            }
@@ -579,8 +579,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Tube",
          "InletFlow": {
@@ -611,7 +611,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 10.5,
              "Unit": "cmH2O"

--- a/data/human/adult/scenarios/combined/Nathan.json
+++ b/data/human/adult/scenarios/combined/Nathan.json
@@ -436,8 +436,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -467,7 +467,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Unit": "cmH2O"
            }
@@ -501,8 +501,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "OxygenWallPortPressureLoss": {
+    "EquipmentAction": {
+      "AnesthesiaMachineOxygenWallPortPressureLoss": {
        "State": "On"
      }
    }
@@ -516,8 +516,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "OxygenSource": "BottleOne"
        }

--- a/data/human/adult/scenarios/compartments/AnesthesiaMachineCompartments.json
+++ b/data/human/adult/scenarios/compartments/AnesthesiaMachineCompartments.json
@@ -1198,8 +1198,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InspiratoryExpiratoryRatio": {
@@ -1230,7 +1230,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 14.0,
              "Unit": "cmH2O"

--- a/data/human/adult/scenarios/drug/Albuterol.json
+++ b/data/human/adult/scenarios/drug/Albuterol.json
@@ -1076,8 +1076,8 @@
      }
    }
  }, {
-    "InhalerAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "InhalerConfiguration": {
        "Configuration": {
          "Substance": "Albuterol",
          "MeteredDose": {

--- a/data/human/adult/scenarios/drug/Desflurane.json
+++ b/data/human/adult/scenarios/drug/Desflurane.json
@@ -947,8 +947,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -978,7 +978,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 0.5,
              "Unit": "cmH2O"
@@ -1013,8 +1013,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "OxygenSource": "Wall",

--- a/data/human/adult/scenarios/equipment/AnesthesiaMachineEndotrachealTubeLeakVaried.json
+++ b/data/human/adult/scenarios/equipment/AnesthesiaMachineEndotrachealTubeLeakVaried.json
@@ -485,8 +485,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Tube",
          "InletFlow": {
@@ -517,7 +517,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 10.5,
              "Unit": "cmH2O"
@@ -543,8 +543,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "TubeCuffLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineTubeCuffLeak": {
        "Severity": {
          "Scalar0To1": {
          }
@@ -561,8 +561,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "TubeCuffLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineTubeCuffLeak": {
        "Severity": {
          "Scalar0To1": {
            "Value": 0.5
@@ -580,8 +580,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "TubeCuffLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineTubeCuffLeak": {
        "Severity": {
          "Scalar0To1": {
          }
@@ -598,8 +598,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "TubeCuffLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineTubeCuffLeak": {
        "Severity": {
          "Scalar0To1": {
            "Value": 1.0
@@ -617,8 +617,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "TubeCuffLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineTubeCuffLeak": {
        "Severity": {
          "Scalar0To1": {
          }

--- a/data/human/adult/scenarios/equipment/AnesthesiaMachineExpiratoryValveLeakVaried.json
+++ b/data/human/adult/scenarios/equipment/AnesthesiaMachineExpiratoryValveLeakVaried.json
@@ -472,8 +472,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -504,7 +504,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 10.5,
              "Unit": "cmH2O"
@@ -530,8 +530,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
          }
@@ -548,8 +548,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
            "Value": 0.5
@@ -567,8 +567,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
          }
@@ -585,8 +585,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
            "Value": 1.0
@@ -604,8 +604,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
          }

--- a/data/human/adult/scenarios/equipment/AnesthesiaMachineExpiratoryValveObstructionVaried.json
+++ b/data/human/adult/scenarios/equipment/AnesthesiaMachineExpiratoryValveObstructionVaried.json
@@ -472,8 +472,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -504,7 +504,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 10.5,
              "Unit": "cmH2O"
@@ -530,8 +530,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveObstruction": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveObstruction": {
        "Severity": {
          "Scalar0To1": {
          }
@@ -548,8 +548,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveObstruction": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveObstruction": {
        "Severity": {
          "Scalar0To1": {
            "Value": 0.5
@@ -567,8 +567,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveObstruction": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveObstruction": {
        "Severity": {
          "Scalar0To1": {
          }
@@ -585,8 +585,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveObstruction": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveObstruction": {
        "Severity": {
          "Scalar0To1": {
            "Value": 1.0
@@ -604,8 +604,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "ExpiratoryValveObstruction": {
+    "EquipmentAction": {
+      "AnesthesiaMachineExpiratoryValveObstruction": {
        "Severity": {
          "Scalar0To1": {
          }

--- a/data/human/adult/scenarios/equipment/AnesthesiaMachineInspiratoryValveLeakVaried.json
+++ b/data/human/adult/scenarios/equipment/AnesthesiaMachineInspiratoryValveLeakVaried.json
@@ -472,8 +472,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -504,7 +504,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 10.5,
              "Unit": "cmH2O"
@@ -530,8 +530,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "InspiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineInspiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
          }
@@ -548,8 +548,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "InspiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineInspiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
            "Value": 0.5
@@ -567,8 +567,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "InspiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineInspiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
          }
@@ -585,8 +585,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "InspiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineInspiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
            "Value": 1.0
@@ -604,8 +604,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "InspiratoryValveLeak": {
+    "EquipmentAction": {
+      "AnesthesiaMachineInspiratoryValveLeak": {
        "Severity": {
          "Scalar0To1": {
          }

--- a/data/human/adult/scenarios/equipment/AnesthesiaMachineInspiratoryValveObstructionVaried.json
+++ b/data/human/adult/scenarios/equipment/AnesthesiaMachineInspiratoryValveObstructionVaried.json
@@ -472,8 +472,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "Configuration": {
+    "EquipmentAction": {
+      "AnesthesiaMachineConfiguration": {
        "Configuration": {
          "Connection": "Mask",
          "InletFlow": {
@@ -504,7 +504,7 @@
              "Unit": "1/min"
            }
          },
-          "VentilatorPressure": {
+          "PeakInspiratoryPressure": {
            "ScalarPressure": {
              "Value": 10.5,
              "Unit": "cmH2O"
@@ -530,8 +530,8 @@
      }
    }
  }, {
-    "AnesthesiaMachineAction": {
-      "InspiratoryValveObstruction": {
+    "EquipmentAction": {
+      "AnesthesiaMachineInspiratoryValveObstruction": {
        "Severity": {