Merge branch 'master' into dev

sarthou · Nov 26, 2024 · 9e348e2 · 9e348e2
2 parents d74f151 + f13a557
commit 9e348e2
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 241 deletions.
diff --git a/README.md b/README.md
@@ -21,4 +21,4 @@ On this launcher file, you will find an argument indicating the path to the onto
 You can add your own ontology files in the argument if you want them to be loaded at the beginning of the program.
 
 [Release-Url]: https://sarthou.github.io/ontologenius/
-[Release-image]: http://img.shields.io/badge/release-v3-1eb0fc.svg
+[Release-image]: http://img.shields.io/badge/release-v0.4.3-1eb0fc.svg
diff --git a/docs/cpp_API/FeederPublisher.html b/docs/cpp_API/FeederPublisher.html
@@ -147,150 +147,27 @@ <h2 id="public-functions">Public Functions</h2>
         <div class="table">
           <table class="alignedsummary">
             <tbody>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#FeederPublisher">FeederPublisher</a></b>(const std::string&amp;
-                  <i>name</i>)
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#addRelation">addRelation</a></b>(const std::string&amp; <i>from</i>,
-                  const std::string&amp; <i>property</i>, const std::string&amp; <i>on</i>, const onto_ros::Time&amp;
-                  <i>stamp</i> = onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#addRelation">addRelation</a></b>(const std::string&amp; <i>from</i>,
-                  const std::string&amp; <i>property</i>, const std::string&amp; <i>type</i>, const std::string&amp;
-                  <i>value</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#addInheritage">addInheritage</a></b>(const std::string&amp;
-                  <i>from</i>, const std::string&amp; <i>on</i>, const onto_ros::Time&amp; <i>stamp</i> =
-                  onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#addLanguage">addLanguage</a></b>(const std::string&amp; <i>from</i>,
-                  const std::string&amp; <i>lang</i>, const std::string&amp; <i>name</i>, const onto_ros::Time&amp;
-                  <i>stamp</i> = onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#addConcept">addConcept</a></b>(const std::string&amp; <i>from</i>,
-                  const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().currentTime())</td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#addInverseOf">addInverseOf</a></b>(const std::string&amp;
-                  <i>property</i>, const std::string&amp; <i>inverse_property</i>, const onto_ros::Time&amp;
-                  <i>stamp</i> = onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#removeRelation0">removeRelation</a></b>(const std::string&amp;
-                  <i>from</i>, const std::string&amp; <i>property</i>, const onto_ros::Time&amp; <i>stamp</i> =
-                  onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#removeRelation1">removeRelation</a></b>(const std::string&amp;
-                  <i>from</i>, const std::string&amp; <i>property</i>, const std::string&amp; <i>on</i>, const
-                  onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#removeRelation2">removeRelation</a></b>(const std::string&amp;
-                  <i>from</i>, const std::string&amp; <i>property</i>, const std::string&amp; <i>type</i>, const
-                  std::string&amp; <i>value</i>, const onto_ros::Time&amp; <i>stamp</i> =
-                  onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#removeInheritage">removeInheritage</a></b>(const std::string&amp;
-                  <i>from</i>, const std::string&amp; <i>on</i>, const onto_ros::Time&amp; <i>stamp</i> =
-                  onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#removeLanguage">removeLanguage</a></b>(const std::string&amp;
-                  <i>from</i>, const std::string&amp; <i>lang</i>, const std::string&amp; <i>name</i>, const
-                  onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#removeConcept">removeConcept</a></b>(const std::string&amp;
-                  <i>from</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().currentTime())
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> size_t </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#getNumSubscribers">getNumSubscribers</a></b>()</td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#waitConnected">waitConnected</a></b>()</td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> bool </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#waitUpdate">waitUpdate</a></b>(int32_t <i>timeout</i> = -1)</td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> std::string </td>
-                <td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#commit">commit</a></b>(int32_t
-                  <i>timeout</i> = -1)
-                </td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> bool </td>
-                <td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#commit2">commit</a></b>(const
-                  std::string&amp; <i>commit_name</i>, int32_t <i>timeout</i> = -1)</td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> bool </td>
-                <td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#checkout">checkout</a></b>(const
-                  std::string&amp; <i>commit_name</i>, int32_t <i>timeout</i> = -1)</td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#registerFeederNotificationCallback">registerFeederNotificationCallback</a></b>(const
-                  std::function&lt;void(const std::string&amp;)&gt;&amp; <i>callback</i>)</td>
-              </tr>
-              <tr>
-                <td class="memItemLeft rightAlign topAlign"> </td>
-                <td class="memItemRight bottomAlign"><b><a
-                       href="FeederPublisher.html#registerReasonersNotificationCallback">registerReasonersNotificationCallback</a></b>(const
-                  std::function&lt;void(const std::string&amp;)&gt;&amp; <i>callback</i>)</td>
-              </tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#FeederPublisher">FeederPublisher</a></b>(const std::string&amp; <i>name</i>)</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#addProperty">addProperty</a></b>(const std::string&amp; <i>from</i>, const std::string&amp; <i>property</i>, const std::string&amp; <i>on</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#addProperty">addProperty</a></b>(const std::string&amp; <i>from</i>, const std::string&amp; <i>property</i>, const std::string&amp; <i>type</i>, const std::string&amp; <i>value</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#addInheritage">addInheritage</a></b>(const std::string&amp; <i>child</i>, const std::string&amp; <i>mother</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#addLanguage">addLanguage</a></b>(const std::string&amp; <i>from</i>, const std::string&amp; <i>lang</i>, const std::string&amp; <i>name</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#addConcept">addConcept</a></b>(const std::string&amp; <i>from</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#addInverseOf">addInverseOf</a></b>(const std::string&amp; <i>property</i>, const std::string&amp; <i>inverse_property</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#removeProperty0">removeProperty</a></b>(const std::string&amp; <i>from</i>, const std::string&amp; <i>property</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#removeProperty1">removeProperty</a></b>(const std::string&amp; <i>from</i>, const std::string&amp; <i>property</i>, const std::string&amp; <i>on</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#removeProperty2">removeProperty</a></b>(const std::string&amp; <i>from</i>, const std::string&amp; <i>property</i>, const std::string&amp; <i>type</i>, const std::string&amp; <i>value</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#removeInheritage">removeInheritage</a></b>(const std::string&amp; <i>from</i>, const std::string&amp; <i>on</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#removeLanguage">removeLanguage</a></b>(const std::string&amp; <i>from</i>, const std::string&amp; <i>lang</i>, const std::string&amp; <i>name</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#removeConcept">removeConcept</a></b>(const std::string&amp; <i>from</i>, const onto_ros::Time&amp; <i>stamp</i> = onto_ros::Node::get().current_time())</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> size_t </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#getNumSubscribers">getNumSubscribers</a></b>()</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#waitConnected">waitConnected</a></b>()</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> bool </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#waitUpdate">waitUpdate</a></b>(int32_t <i>timeout</i> = -1)</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> std::string </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#commit">commit</a></b>(int32_t <i>timeout</i> = -1)</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> bool </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#commit2">commit</a></b>(const std::string&amp; <i>commit_name</i>, int32_t <i>timeout</i> = -1)</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> bool </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#checkout">checkout</a></b>(const std::string&amp; <i>commit_name</i>, int32_t <i>timeout</i> = -1)</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#registerFeederNotificationCallback">registerFeederNotificationCallback</a></b>(const std::function&lt;void(const std::string&amp;)&gt;&amp; <i>callback</i>)</td></tr>
+              <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="FeederPublisher.html#registerReasonersNotificationCallback">registerReasonersNotificationCallback</a></b>(const std::function&lt;void(const std::string&amp;)&gt;&amp; <i>callback</i>)</td></tr>
             </tbody>
           </table>
         </div>
@@ -350,13 +227,12 @@ <h3 class="fn" id="addRelation"><a name="addRelation"></a>FeederPublisher::<span
           </p>
 
           <h3 class="fn" id="addInheritage"><a name="addInheritage"></a>FeederPublisher::<span
-                  class="name">addInheritage</span>(const <span class="type">std::string</span>&amp; <i>from</i>, const
-            <span class="type">std::string</span>&amp; <i>on</i>, const <span class="type">onto_ros::Time</span>&amp;
-            <i>stamp</i> = onto_ros::Node::get().currentTime())
-          </h3>
-          <p>Adds the inheratage: <i>from</i> is a <i>on</i>. <i>from</i> and <i>on</i> could by a class, an individual
+              class="name">addInheritage</span>(const <span class="type">std::string</span>&amp; <i>child</i>, const
+            <span class="type">std::string</span>&amp; <i>mother</i>, const <span class="type">onto_ros::Time</span>&amp;
+            <i>stamp</i> = onto_ros::Node::get().currentTime())</h3>
+          <p>Adds the inheratage: <i>child</i> is a <i>mother</i>. <i>child</i> and <i>mother</i> could by a class, an individual
             or a property.</p>
-          <p>At least <i>from</i> or <i>on</i> must be already known to the system. If one of them is unknown, it will
+          <p>At least <i>child</i> or <i>mother</i> must be already known to the system. If one of them is unknown, it will
             be automatically created.</p>
           <p>onto_ros::Time is an abstraction of the ROS time definition which can be provided either with ROS1 and ROS2
             time representation (i.e. ros::Time or rclcpp::Time).</p>