Merge branch 'dev'

sarthou · Dec 21, 2020 · 87ffb3c · 87ffb3c
2 parents 87db6b9 + d938078
commit 87ffb3c
Show file tree

Hide file tree

Showing 219 changed files with 10,816 additions and 3,433 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,6 +5,7 @@
     - catkin_make
     - cd src
     - cp -r /builds/$GITLAB_USER_LOGIN/mementar .
+    - git clone -b proba https://github.com/sarthou/ontologenius.git
     - cd ..
     - catkin_make
 
@@ -15,8 +16,11 @@
     - catkin_make
     - cd src
     - cp -r /builds/$GITLAB_USER_LOGIN/mementar .
+    - git clone -b proba https://github.com/sarthou/ontologenius.git
     - cd ..
     - catkin_make
+    - source devel/setup.bash
+    - catkin_make run_tests_mementar_rostest -j1 && catkin_make test -j1 -DCATKIN_WHITELIST_PACKAGES="mementar"
 
 .kinetic_before_template : &kinetic_before_definition
   before_script:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,13 +14,15 @@ find_package(catkin REQUIRED COMPONENTS
   genmsg
   message_generation
   pluginlib
+  ontologenius
 )
 
 ## System dependencies are found with CMake's conventions
 find_package(Boost REQUIRED COMPONENTS system)
 find_package(cmake_modules REQUIRED)
 find_package(pluginlib REQUIRED)
 find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport)
+find_package(OpenCV REQUIRED)
 
 
 ################################################
@@ -30,16 +32,18 @@ find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport)
 ## Generate messages in the 'msg' folder
  add_message_files(
    FILES
-   MementarEvent.msg
+   MementarAction.msg
+   MementarExplanation.msg
+   MementarOccasion.msg
    StampedString.msg
  )
 
 ## Generate services in the 'srv' folder
  add_service_files(
   FILES
   MementarService.srv
-  MementarEventSubscription.srv
-  MementarEventUnsubscription.srv
+  MementarOccasionSubscription.srv
+  MementarOcassionUnsubscription.srv
  )
 
 ## Generate added messages and services with any dependencies listed here
@@ -60,7 +64,8 @@ find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport)
 catkin_package(
   INCLUDE_DIRS include
   LIBRARIES mementar_lib
-  CATKIN_DEPENDS roscpp rospy std_msgs
+  CATKIN_DEPENDS roscpp rospy std_msgs ontologenius
+  DEPENDS OpenCV
 )
 
 ###########
@@ -70,7 +75,7 @@ catkin_package(
 ## Specify additional locations of header files
 ## Your package locations should be listed before other locations
 include_directories(
-  include
+  include include/mementar/API
   ${catkin_INCLUDE_DIRS}
 )
 
@@ -81,65 +86,95 @@ include_directories(
 ## ARCHIVING & COMPRESSION
 ##############################
 
+##############################
+## EVENTS
+##############################
+
+add_library(mementar_events_lib
+  src/core/Occasions/Subscription.cpp
+  src/core/Occasions/OccasionsManager.cpp
+)
+target_link_libraries(mementar_events_lib ${catkin_LIBRARIES})
+add_dependencies(mementar_events_lib ${catkin_EXPORTED_TARGETS} mementar_gencpp)
+
 ##############################
 ## CORE
 ##############################
 add_library(mementar_compression_lib
-  src/core/archiving_compressing/binaryManagement/BitFileGenerator.cpp
-  src/core/archiving_compressing/binaryManagement/BitFileGetter.cpp
-  src/core/archiving_compressing/compressing/LzCompress.cpp
-  src/core/archiving_compressing/compressing/LzUncompress.cpp
-  src/core/archiving_compressing/compressing/Huffman.cpp
-  src/core/archiving_compressing/archiving/Header.cpp
-  src/core/archiving_compressing/archiving/Archive.cpp
+  src/core/LtManagement/archiving_compressing/binaryManagement/BitFileGenerator.cpp
+  src/core/LtManagement/archiving_compressing/binaryManagement/BitFileGetter.cpp
+  src/core/LtManagement/archiving_compressing/compressing/LzCompress.cpp
+  src/core/LtManagement/archiving_compressing/compressing/LzUncompress.cpp
+  src/core/LtManagement/archiving_compressing/compressing/Huffman.cpp
+  src/core/LtManagement/archiving_compressing/archiving/Header.cpp
+  src/core/LtManagement/archiving_compressing/archiving/Archive.cpp
 )
 
 add_library(mementar_memGraphs_lib
   src/core/memGraphs/Branchs/ValuedNode.cpp
   src/core/memGraphs/Branchs/types/Action.cpp
-  src/core/memGraphs/DoublyLinkedList/DllCargoNode.cpp
-  src/core/memGraphs/DoublyLinkedList/DllLinkedElement.cpp
+  src/core/memGraphs/Branchs/types/Fact.cpp
+  src/core/memGraphs/Branchs/types/SoftPoint.cpp
+  src/core/memGraphs/Branchs/types/Triplet.cpp
   src/core/memGraphs/Graphs/ActionGraph.cpp
-  src/core/memGraphs/Graphs/EventGraph.cpp
+  src/core/memGraphs/Graphs/FactGraph.cpp
 )
 
-add_library(mementar_core_lib
-  src/core/EpisodicTree/CompressedLeaf.cpp
-  src/core/EpisodicTree/CompressedLeafNode.cpp
-  src/core/EpisodicTree/Context.cpp
-  src/core/EpisodicTree/CompressedLeafSession.cpp
-  src/core/EpisodicTree/CompressedLeafNodeSession.cpp
-  src/core/EpisodicTree/ArchivedLeaf.cpp
-  src/core/EpisodicTree/ArchivedLeafNode.cpp
-)
-target_link_libraries(mementar_core_lib
+add_library(mementar_lt_lib
+  src/core/LtManagement/EpisodicTree/CompressedLeaf.cpp
+  src/core/LtManagement/EpisodicTree/CompressedLeafNode.cpp
+  src/core/LtManagement/EpisodicTree/Context.cpp
+  src/core/LtManagement/EpisodicTree/CompressedLeafSession.cpp
+  src/core/LtManagement/EpisodicTree/CompressedLeafNodeSession.cpp
+  src/core/LtManagement/EpisodicTree/ArchivedLeaf.cpp
+  src/core/LtManagement/EpisodicTree/ArchivedLeafNode.cpp
+)
+target_link_libraries(mementar_lt_lib
   mementar_compression_lib
   mementar_memGraphs_lib
   pthread
 )
 
+add_library(mementar_core_lib
+  src/core/feeder/FeedStorage.cpp
+  src/core/feeder/Feeder.cpp
+  src/core/Parametrization/Configuration.cpp
+)
+target_link_libraries(mementar_core_lib mementar_lt_lib)
+target_link_libraries(mementar_core_lib ${catkin_LIBRARIES})
+add_dependencies(mementar_core_lib ${catkin_EXPORTED_TARGETS})
+
 ##############################
-## EVENTS
+## DRAWER
 ##############################
 
-add_library(mementar_events_lib
-  src/core/Events/Subscription.cpp
-  src/core/Events/EventsManager.cpp
+add_library(mementar_drawer_lib
+  src/graphical/timeline/ActionReader.cpp
+  src/graphical/timeline/FactReader.cpp
+  src/graphical/timeline/TimelineDrawer.cpp
+)
+target_include_directories(mementar_drawer_lib
+PUBLIC
+ ${OpenCV_INCLUDE_DIRS}
+)
+target_link_libraries(mementar_drawer_lib
+  mementar_memGraphs_lib
+  ${OpenCV_LIBS}
 )
-target_link_libraries(mementar_events_lib ${catkin_LIBRARIES})
-add_dependencies(mementar_events_lib ${catkin_EXPORTED_TARGETS} mementar_gencpp)
 
 ##############################
 ## API
 ##############################
 
 add_library(mementar_lib
+  src/API/ActionsPublisher.cpp
+  src/API/ActionsSubscriber.cpp
   src/API/TimelineManipulator.cpp
   src/API/TimelinesManipulator.cpp
   src/API/clients/ManagerClient.cpp
   src/API/clients/ClientBase.cpp
-  src/API/EventsPublisher.cpp
-  src/API/EventsSubscriber.cpp
+  src/API/OccasionsPublisher.cpp
+  src/API/OccasionsSubscriber.cpp
 )
 target_link_libraries(mementar_lib ${catkin_LIBRARIES})
 add_dependencies(mementar_lib ${catkin_EXPORTED_TARGETS} mementar_gencpp)
@@ -151,7 +186,7 @@ add_dependencies(mementar_lib ${catkin_EXPORTED_TARGETS} mementar_gencpp)
 add_library(mementar_interface
   src/RosInterface.cpp
 )
-target_link_libraries(mementar_interface mementar_core_lib mementar_events_lib)
+target_link_libraries(mementar_interface mementar_core_lib mementar_events_lib mementar_drawer_lib)
 target_link_libraries(mementar_interface ${catkin_LIBRARIES})
 add_dependencies(mementar_interface ${catkin_EXPORTED_TARGETS} mementar_gencpp)
 
@@ -171,18 +206,86 @@ target_link_libraries(mementar_multi mementar_interface)
 target_link_libraries(mementar_multi ${catkin_LIBRARIES})
 add_dependencies(mementar_multi ${catkin_EXPORTED_TARGETS})
 
+add_executable(mementar_timeline src/graphical/timeline/main.cpp)
+target_link_libraries(mementar_timeline mementar_core_lib mementar_drawer_lib)
+target_link_libraries(mementar_timeline ${catkin_LIBRARIES})
+add_dependencies(mementar_timeline ${catkin_EXPORTED_TARGETS})
+
 ##############################
 ## Test executables
 ##############################
 
-add_executable(event_sub_pub src/test/event_sub_pub.cpp)
+add_executable(config src/test/config.cpp)
+target_link_libraries(config ${catkin_LIBRARIES})
+target_link_libraries(config mementar_interface)
+
+add_executable(event_sub_pub src/test/occasions_sub_pub.cpp)
 target_link_libraries(event_sub_pub ${catkin_LIBRARIES})
 target_link_libraries(event_sub_pub mementar_lib)
 
 add_executable(graphs src/test/graphs.cpp)
 target_link_libraries(graphs ${catkin_LIBRARIES})
 target_link_libraries(graphs mementar_memGraphs_lib)
 
+
+#add_executable(eventLink src/test/EventLink.cpp)
+#target_link_libraries(eventLink mementar_lt_lib)
+
+##############################################################################
+# Qt Environment
+##############################################################################
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+##############################################################################
+# Sections
+##############################################################################
+
+file(GLOB QT_FORMS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ui/*.ui)
+file(GLOB QT_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}  resources/*.qrc)
+
+QT5_ADD_RESOURCES(QT_RESOURCES_CPP ${QT_RESOURCES})
+QT5_WRAP_UI(QT_FORMS_HPP ${QT_FORMS})
+
+add_definitions( -std=c++11 -fPIC)
+
+##############################################################################
+# Sources
+##############################################################################
+
+set( QT_SOURCES
+    src/graphical/mementarGUI/main.cpp
+    src/graphical/mementarGUI/mementargui.cpp
+    src/graphical/mementarGUI/DarkStyle.cpp
+    src/graphical/mementarGUI/QPushButtonExtended.cpp
+    src/graphical/mementarGUI/QCheckBoxExtended.cpp
+    src/graphical/mementarGUI/QLineEditExtended.cpp
+
+    include/mementar/graphical/mementarGUI/mementargui.h
+    include/mementar/graphical/mementarGUI/DarkStyle.h
+    include/mementar/graphical/mementarGUI/QPushButtonExtended.h
+    include/mementar/graphical/mementarGUI/QCheckBoxExtended.h
+    include/mementar/graphical/mementarGUI/QLineEditExtended.h
+)
+##############################################################################
+# Binaries
+##############################################################################
+
+add_executable(mementarGUI ${QT_SOURCES} ${QT_RESOURCES_CPP} ${QT_FORMS_HPP} ${QT_MOC_HPP})
+target_include_directories(mementarGUI
+  PRIVATE
+    ${catkin_INCLUDE_DIRS}
+)
+add_dependencies(mementarGUI mementar_gencpp)
+target_link_libraries(mementarGUI
+    ${catkin_LIBRARIES}
+    Qt5::Core
+    Qt5::Widgets
+    Qt5::PrintSupport
+)
+install(TARGETS mementarGUI RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+
 ##############################
 ## Install
 ##############################
@@ -208,6 +311,10 @@ install(DIRECTORY include/${PROJECT_NAME}/
 if(CATKIN_ENABLE_TESTING)
   find_package(rostest REQUIRED)
 
-  #add_rostest_gtest(mementar_tester test/library.test src/tests/library.cpp)
-  #target_link_libraries(mementar_tester mementar_lib)
+  add_rostest_gtest(mementar_fact_pub_sub_tester test/fact_pub_sub.test src/test/CI/fact_pub_sub.cpp)
+  target_link_libraries(mementar_fact_pub_sub_tester mementar_lib ontologenius_lib)
+
+  add_rostest_gtest(mementar_action_pub_sub_tester test/action_pub_sub.test src/test/CI/action_pub_sub.cpp)
+  target_link_libraries(mementar_action_pub_sub_tester mementar_lib ontologenius_lib)
+
 endif()
diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@
 
 ```
 G. Sarthou, mementar,” https://github.com/sarthou/mementar,
-LAAS-CNRS, Toulouse, 2018 – 2019.
+LAAS-CNRS, Toulouse, 2018 – 2020.
 ```
 
 [Release-Url]: https://github.com/sarthou/mementar/releases
-[Release-image]: http://img.shields.io/badge/release-v0.0.2-1eb0fc.svg
+[Release-image]: http://img.shields.io/badge/release-v0.0.3-1eb0fc.svg
diff --git a/docs/Download.html b/docs/Download.html
@@ -1,7 +1,7 @@
 <html lang="en_US">
 
 <head>
-  <title>Download | Mementar 0.0.2</title>
+  <title>Download | Mementar 0.0.3</title>
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
   <link href="style/mementar_api.css" rel="stylesheet" type="text/css">
   <link href="img/logo/favicon.ico" rel="shortcut icon">
@@ -38,6 +38,7 @@
         <li><a href="https://gitlab.com/sarthou/mementar/pipelines">Pipelines</a></li>
       </ul>
       <h1>Mementar Documentation</h1>
+      <h2>Mementar 0.0.3</h2>
     </div>
 
     <div class="content">
@@ -56,15 +57,15 @@ <h3>Getting Start</h3>
 
         <div class="contents">
           <div id="contents-toggle" class=""></div>
-          <h3><a href="CppAPI.html">All C++ Classes</a></h3>
+          <h3><a href="cpp_API/CppAPI.html">All C++ Classes</a></h3>
           <ul style="display: block;">
-            <li class="level1"><a href="ClientBase.html">ClientBase</a></li>
-            <li class="level1"><a href="Event.html">Event</a></li>
-            <li class="level1"><a href="EventsPublisher.html">EventsPublisher</a></li>
-            <li class="level1"><a href="EventsSubscriber.html">EventsSubscriber</a></li>
-            <li class="level1"><a href="ManagerClient.html">ManagerClient</a></li>
-            <li class="level1"><a href="TimelineManipulator.html">TimelineManipulator</a></li>
-            <li class="level1"><a href="TimelinesManipulator.html">TimelinesManipulator</a></li>
+            <li class="level1"><a href="cpp_API/ClientBase.html">ClientBase</a></li>
+            <li class="level1"><a href="cpp_API/Fact.html">Fact</a></li>
+            <li class="level1"><a href="cpp_API/ManagerClient.html">ManagerClient</a></li>
+            <li class="level1"><a href="cpp_API/OccasionsPublisher.html">OccasionsPublisher</a></li>
+            <li class="level1"><a href="cpp_API/OccasionsSubscriber.html">OccasionsSubscriber</a></li>
+            <li class="level1"><a href="cpp_API/TimelineManipulator.html">TimelineManipulator</a></li>
+            <li class="level1"><a href="cpp_API/TimelinesManipulator.html">TimelinesManipulator</a></li>
           </ul>
         </div>
       </div>
@@ -77,6 +78,31 @@ <h1 class="title">Download</h1>
 
         <p>You have below the archives of the major versions of mementar:</p>
 
+        <h2> V0.0.3 </h2>
+        <p>21 / 12 / 2020</p>
+
+        <ul>
+          <li>
+            <a href="https://github.com/sarthou/mementar/archive/v0.0.3.zip" rel="nofollow">
+              <svg class="octicon octicon-file-zip flex-shrink-0 text-gray" width="16" height="16" viewBox="0 0 12 16" version="1.1" aria-hidden="true">
+                <path fill-rule="evenodd" d="M8.5 1H1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V4.5L8.5 1zM11 14H1V2h3v1h1V2h3l3 3v9zM5 4V3h1v1H5zM4 4h1v1H4V4zm1 2V5h1v1H5zM4 6h1v1H4V6zm1 2V7h1v1H5zM4 9.28A2 2 0 0 0 3 11v1h4v-1a2 2 0 0 0-2-2V8H4v1.28zM6 10v1H4v-1h2z">
+                </path>
+              </svg>
+              <strong class="px-1">Source code</strong> (zip)
+            </a>
+          </li>
+
+          <li>
+            <a href="https://github.com/sarthou/mementar/archive/v0.0.3.tar.gz" rel="nofollow">
+              <svg class="octicon octicon-file-zip flex-shrink-0 text-gray" width="16" height="16" viewBox="0 0 12 16" version="1.1" aria-hidden="true">
+                <path fill-rule="evenodd" d="M8.5 1H1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V4.5L8.5 1zM11 14H1V2h3v1h1V2h3l3 3v9zM5 4V3h1v1H5zM4 4h1v1H4V4zm1 2V5h1v1H5zM4 6h1v1H4V6zm1 2V7h1v1H5zM4 9.28A2 2 0 0 0 3 11v1h4v-1a2 2 0 0 0-2-2V8H4v1.28zM6 10v1H4v-1h2z">
+                </path>
+              </svg>
+              <strong class="px-1">Source code</strong> (tar.gz)
+            </a>
+          </li>
+        </ul>
+
         <h2> V0.0.2 </h2>
         <p>10 / 07 / 2019</p>