Diff: src/ConfigurationHandler/Controls/CompositeControl.h

Revision:

220:dbe21411f962

Parent:

195:21df85341cb3

Child:

221:2a5e9902003c

--- a/src/ConfigurationHandler/Controls/CompositeControl.h	Tue Oct 11 18:39:43 2016 +0000
+++ b/src/ConfigurationHandler/Controls/CompositeControl.h	Fri Oct 14 13:32:47 2016 +0000
@@ -11,31 +11,44 @@
 #include <vector>
 #include <stdio.h>
 
+
+
 class CompositeControl
 {
 private:
+    typedef struct oe_tag {
+        std::string     tag;
+        std::string     response;
+    } OutputElement;
+    
     std::string                 controlFile;    // the control file
     std::string                 id;             // composite identifier
-    std::vector<std::string>    inputs;         // (virtual) input(s)     
-    std::vector<std::string>    outputs;        // (virtual) output(s)
+    unsigned int                priority;       // control priority
+    std::string                 ca;             // control algorithm
+    std::vector<std::string>    inputs;         // (virtual) input(s)
+    std::vector<OutputElement>  outputs;        // (virtual) output(s)
 public:
     CompositeControl() { }
-    ~CompositeControl() { printf("\r%s invoked\n", __func__); }
-    
+    ~CompositeControl() {
+        printf("\r%s invoked\n", __func__);
+    }
+
     bool load(std::string controlFile);
-    
+
     std::string getControlFile(void) const {
         return controlFile;
     }
     std::string getId(void) const {
         return id;
     }
-    
-    std::vector<std::string> getInputs(void) const; 
+
+    std::vector<std::string> getInputs(void) const;
     std::vector<std::string> getOutputs(void) const;
-    
+
     // unregister the control with the output task
     void unregisterControl(void);
+    
+    void display(void);
 };
 
 #endif