Implemented variables and add googletest as submodule.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/lib/googletest"]
+	path = test/lib/googletest
+	url = [email protected]:google/googletest.git

src/random_events/CMakeLists.txt

@@ -3,5 +3,6 @@ add_library(random_events_lib interval.cpp
         include/set.h
         set.cpp
         variable.cpp
+        include/product_algebra.h
 )
 target_include_directories(random_events_lib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)

src/random_events/include/product_algebra.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "sigma_algebra.h"
+
+
+class Event; // Forward declaration
+
+class SimpleEvent : public SimpleSetWrapper<Event, SimpleEvent, std::tuple<int>> {
+
+};
+
+/**
+ * Class that represents the product algebra.
+ */
+class Event : public CompositeSetWrapper<Event, SimpleEvent, std::tuple<int>> {
+
+};

src/random_events/include/variable.h

@@ -2,9 +2,14 @@
 
 #include "sigma_algebra.h"
 #include "interval.h"
+#include "set.h"
 #include <string>
 #include <utility>
 
+
+/**
+ * Template class for variables.
+ */
 template<typename T_Variable, typename T_Domain>
 class Variable {
 public:
@@ -24,6 +29,25 @@ class Variable {
 
 };
 
+
+class Symbolic: public Variable<Symbolic, Set>{
+public:
+    explicit Symbolic(std::string  name, Set domain): Variable<Symbolic, Set>(std::move(name), std::move(domain)){};
+};
+
+class Integer: public Variable<Integer, Interval>{
+public:
+
+    [[maybe_unused]] const Interval domain = reals();
+
+    explicit Integer(std::string name) : Variable(name, reals()) {
+        Variable<Integer, Interval>::name = std::move(name);
+    };
+};
+
+/**
+ * Class that represents a continuous variable.
+ */
 class Continuous: public Variable<Continuous, Interval>{
 public:
 

test/CMakeLists.txt

@@ -1,7 +1,15 @@
-project(GoogleTests)
-
 add_subdirectory(lib)
 
 include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
 
-add_subdirectory(test_interval)
+# adding the Google_Tests_run target
+add_executable(RunUnitTest test_interval.cpp
+        test_set.cpp
+        test_variable.cpp)
+
+include_directories(${SRC_DIR}/random_events/include)
+
+# linking Google_Tests_run with random_events_lib which will be tested
+target_link_libraries(RunUnitTest random_events_lib)
+
+target_link_libraries(RunUnitTest gtest gtest_main)

test/test_variable.cpp

@@ -0,0 +1,22 @@
+#include "gtest/gtest.h"
+#include "interval.h"
+#include "variable.h"
+#include "set.h"
+
+TEST(Variable, Continuous) {
+    Continuous continuous("x");
+    EXPECT_EQ(continuous.name, "x");
+    EXPECT_EQ(continuous.domain, reals());
+}
+
+TEST(Variable, Symbolic) {
+    auto variable = Symbolic("x", Set({"a", "b", "c"}));
+    EXPECT_EQ(variable.name, "x");
+    EXPECT_EQ(variable.domain, Set({"a", "b", "c"}));
+}
+
+TEST(Variable, Integer) {
+    auto variable = Integer("x");
+    EXPECT_EQ(variable.name, "x");
+    EXPECT_EQ(variable.domain, reals());
+}