Cleaning up drivers/Cpp, Cpp/Lifxtest, virtuals, and iotrmi/C++ (revisiting the C...

[iot2.git] / benchmarks / Cpp / Lifxtest / Lifxtest.hpp

diff --git a/benchmarks/Cpp/Lifxtest/Lifxtest.hpp b/benchmarks/Cpp/Lifxtest/Lifxtest.hpp
index 0cdc745974eb865df63f66786587cba8e3624a49..4631ed2f3712d3797fc7ea061e57fb3adf359f7c 100644 (file)
--- a/benchmarks/Cpp/Lifxtest/Lifxtest.hpp
+++ b/benchmarks/Cpp/Lifxtest/Lifxtest.hpp
@@ -1,22 +1,30 @@
 #ifndef _LIFXTEST_HPP__
 #define _LIFXTEST_HPP__
 #include <iostream>
+#include <fstream>
 
 #include "IoTSet.hpp"
+#include "IoTRelation.hpp"
 #include "LightBulb.hpp"
 #include "LightBulbTest.hpp"
+#include "Room.hpp"
+#include "RoomSmart.hpp"
+
 
 class Lifxtest {
 
        private:
                // IoTSet
-               //IoTSet<LightBulbTest*> lifx_light_bulb;
-               IoTSet<LightBulb*> lifx_light_bulb;
+               IoTSet<void*>* lifx_light_bulb; // LightBulbTest
+               IoTSet<void*>* lab_room;                // RoomSmart
+               IoTRelation<void*,void*>* roomLightRelation;    // RoomSmart and LightBulbTest
+
+               ofstream log;
 
        public:
 
                Lifxtest();
-               //Lifxtest(IoTSet<LightBulbTest*> _lifx_light_bulb);
+               Lifxtest(IoTSet<void*>* _lifx_light_bulb, IoTSet<void*>* _lab_room, IoTRelation<void*,void*>* _roomLightRelation);
                Lifxtest(void** args);
                ~Lifxtest();
                void init();