deploy: 278ded2

moja-global · Dec 19, 2024 · 910ea30 · 910ea30
1 parent 9be19c0
commit 910ea30
Show file tree

Hide file tree

Showing 13 changed files with 174 additions and 126 deletions.
diff --git a/cbmtransitionrulesmodule_8h_source.html b/cbmtransitionrulesmodule_8h_source.html
diff --git a/classmoja_1_1modules_1_1cbm_1_1TransitionRule-members.html b/classmoja_1_1modules_1_1cbm_1_1TransitionRule-members.html
@@ -81,10 +81,12 @@
   <tr><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#ad1c6f678c7a918845f199b65fbda9652">addClassifier</a>(std::string name, std::string value)</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a71c3d6be8165cbcb6375a3d4ace78c37">classifiers</a>() const</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a4a716406d3d9d4fdbbe46f100e648f3b">id</a>()</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a7e7ec05f8274eae2d58bc8b6545ae0fe">regenDelay</a>()</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a4fa581cc279027a6bb3d5cbcb4c13fd0">resetAge</a>()</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a9cad8883cbf4d9375237ef83adb0e6da">resetType</a>()</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a481b7fb7e59ebdc5c58708e0f7687a38">TransitionRule</a>()</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a9c3d851e7188d05ab907d60b7db7ed82">merge</a>(const TransitionRule &amp;other)</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a7e7ec05f8274eae2d58bc8b6545ae0fe">regenDelay</a>()</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a4fa581cc279027a6bb3d5cbcb4c13fd0">resetAge</a>()</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a9cad8883cbf4d9375237ef83adb0e6da">resetType</a>()</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a481b7fb7e59ebdc5c58708e0f7687a38">TransitionRule</a>()</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a216e9c1db98a39f45f96844f063dd538">TransitionRule</a>(const TransitionRule &amp;other)</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#afc776084b9bfece0a33990a72be079ff">TransitionRule</a>(const DynamicObject &amp;data)</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a8c465921dfc305df58cc45c4f9870a5a">TransitionRule</a>(int id, int resetAge, int regenDelay)</td><td class="entry"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->

diff --git a/classmoja_1_1modules_1_1cbm_1_1TransitionRule.html b/classmoja_1_1modules_1_1cbm_1_1TransitionRule.html
@@ -81,14 +81,16 @@
 <div class="dyncontent">
 <div class="center"><img src="classmoja_1_1modules_1_1cbm_1_1TransitionRule__coll__graph.png" border="0" usemap="#aTransitionRule_coll__map" alt="Collaboration graph"/></div>
 <map name="aTransitionRule_coll__map" id="aTransitionRule_coll__map">
-<area shape="rect" title=" " alt="" coords="5,5,144,259"/>
+<area shape="rect" title=" " alt="" coords="5,5,144,288"/>
 </map>
 </div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
 <tr class="memitem:a481b7fb7e59ebdc5c58708e0f7687a38"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a481b7fb7e59ebdc5c58708e0f7687a38">TransitionRule</a> ()</td></tr>
 <tr class="separator:a481b7fb7e59ebdc5c58708e0f7687a38"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a216e9c1db98a39f45f96844f063dd538"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a216e9c1db98a39f45f96844f063dd538">TransitionRule</a> (const <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a> &amp;other)</td></tr>
+<tr class="separator:a216e9c1db98a39f45f96844f063dd538"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:afc776084b9bfece0a33990a72be079ff"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#afc776084b9bfece0a33990a72be079ff">TransitionRule</a> (const DynamicObject &amp;data)</td></tr>
 <tr class="separator:afc776084b9bfece0a33990a72be079ff"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a8c465921dfc305df58cc45c4f9870a5a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a8c465921dfc305df58cc45c4f9870a5a">TransitionRule</a> (int <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a4a716406d3d9d4fdbbe46f100e648f3b">id</a>, int <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a4fa581cc279027a6bb3d5cbcb4c13fd0">resetAge</a>, int <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a7e7ec05f8274eae2d58bc8b6545ae0fe">regenDelay</a>)</td></tr>
@@ -105,6 +107,8 @@
 <tr class="separator:a71c3d6be8165cbcb6375a3d4ace78c37"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad1c6f678c7a918845f199b65fbda9652"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#ad1c6f678c7a918845f199b65fbda9652">addClassifier</a> (std::string name, std::string value)</td></tr>
 <tr class="separator:ad1c6f678c7a918845f199b65fbda9652"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9c3d851e7188d05ab907d60b7db7ed82"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a9c3d851e7188d05ab907d60b7db7ed82">merge</a> (const <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a> &amp;other)</td></tr>
+<tr class="separator:a9c3d851e7188d05ab907d60b7db7ed82"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pri-attribs"></a>
 Private Attributes</h2></td></tr>
@@ -121,7 +125,7 @@
 </table>
 <h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a id="a481b7fb7e59ebdc5c58708e0f7687a38"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a481b7fb7e59ebdc5c58708e0f7687a38">&#9670;&nbsp;</a></span>TransitionRule() <span class="overload">[1/3]</span></h2>
+<h2 class="memtitle"><span class="permalink"><a href="#a481b7fb7e59ebdc5c58708e0f7687a38">&#9670;&nbsp;</a></span>TransitionRule() <span class="overload">[1/4]</span></h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -135,10 +139,28 @@ <h2 class="memtitle"><span class="permalink"><a href="#a481b7fb7e59ebdc5c58708e0
       </table>
 </div><div class="memdoc">
 
+</div>
+</div>
+<a id="a216e9c1db98a39f45f96844f063dd538"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a216e9c1db98a39f45f96844f063dd538">&#9670;&nbsp;</a></span>TransitionRule() <span class="overload">[2/4]</span></h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a> </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a> &amp;&#160;</td>
+          <td class="paramname"><em>other</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
 </div>
 </div>
 <a id="afc776084b9bfece0a33990a72be079ff"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#afc776084b9bfece0a33990a72be079ff">&#9670;&nbsp;</a></span>TransitionRule() <span class="overload">[2/3]</span></h2>
+<h2 class="memtitle"><span class="permalink"><a href="#afc776084b9bfece0a33990a72be079ff">&#9670;&nbsp;</a></span>TransitionRule() <span class="overload">[3/4]</span></h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -171,7 +193,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#afc776084b9bfece0a33990a7
 </div>
 </div>
 <a id="a8c465921dfc305df58cc45c4f9870a5a"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a8c465921dfc305df58cc45c4f9870a5a">&#9670;&nbsp;</a></span>TransitionRule() <span class="overload">[3/3]</span></h2>
+<h2 class="memtitle"><span class="permalink"><a href="#a8c465921dfc305df58cc45c4f9870a5a">&#9670;&nbsp;</a></span>TransitionRule() <span class="overload">[4/4]</span></h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -265,6 +287,24 @@ <h2 class="memtitle"><span class="permalink"><a href="#a4a716406d3d9d4fdbbe46f10
       </table>
 </div><div class="memdoc">
 
+</div>
+</div>
+<a id="a9c3d851e7188d05ab907d60b7db7ed82"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a9c3d851e7188d05ab907d60b7db7ed82">&#9670;&nbsp;</a></span>merge()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a> merge </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html">TransitionRule</a> &amp;&#160;</td>
+          <td class="paramname"><em>other</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
 </div>
 </div>
 <a id="a7e7ec05f8274eae2d58bc8b6545ae0fe"></a>

diff --git a/classmoja_1_1modules_1_1cbm_1_1TransitionRule__coll__graph.map b/classmoja_1_1modules_1_1cbm_1_1TransitionRule__coll__graph.map
@@ -1,3 +1,3 @@
 <map id="TransitionRule" name="TransitionRule">
-<area shape="rect" id="node1" title=" " alt="" coords="5,5,144,259"/>
+<area shape="rect" id="node1" title=" " alt="" coords="5,5,144,288"/>
 </map>
diff --git a/classmoja_1_1modules_1_1cbm_1_1TransitionRule__coll__graph.md5 b/classmoja_1_1modules_1_1cbm_1_1TransitionRule__coll__graph.md5
@@ -1 +1 @@
-e7fdb2d6592e9c7184b29eed23380bcd
+027deb277bc1b7f590711b29b6b11523
diff --git a/classmoja_1_1modules_1_1cbm_1_1TransitionRule__coll__graph.png b/classmoja_1_1modules_1_1cbm_1_1TransitionRule__coll__graph.png
diff --git a/functions_func_m.html b/functions_func_m.html
@@ -113,6 +113,7 @@ <h3><a id="index_m"></a>- m -</h3><ul>
 , <a class="el" href="classmoja_1_1modules_1_1cbm_1_1PoolInfoRecord.html#a834f83ec6b649a5fe4d409dbc00aaa2e">PoolInfoRecord</a>
 , <a class="el" href="classmoja_1_1modules_1_1cbm_1_1PoolRecord.html#a27f4553365ab35a40d8d69e09cd6c8fc">PoolRecord</a>
 , <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TemporalLocationRecord.html#a887fe8496601c44893277ae4662da043">TemporalLocationRecord</a>
+, <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a9c3d851e7188d05ab907d60b7db7ed82">TransitionRule</a>
 </li>
 <li>metadata()
 : <a class="el" href="classmoja_1_1modules_1_1cbm_1_1CBMDistEventRef.html#a8e9d1dd2afb3f46041362bb34a7a6cf3">CBMDistEventRef</a>

diff --git a/functions_m.html b/functions_m.html
@@ -191,6 +191,7 @@ <h3><a id="index_m"></a>- m -</h3><ul>
 , <a class="el" href="classmoja_1_1modules_1_1cbm_1_1PoolInfoRecord.html#a834f83ec6b649a5fe4d409dbc00aaa2e">PoolInfoRecord</a>
 , <a class="el" href="classmoja_1_1modules_1_1cbm_1_1PoolRecord.html#a27f4553365ab35a40d8d69e09cd6c8fc">PoolRecord</a>
 , <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TemporalLocationRecord.html#a887fe8496601c44893277ae4662da043">TemporalLocationRecord</a>
+, <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a9c3d851e7188d05ab907d60b7db7ed82">TransitionRule</a>
 </li>
 <li>metadata()
 : <a class="el" href="classmoja_1_1modules_1_1cbm_1_1CBMDistEventRef.html#a8e9d1dd2afb3f46041362bb34a7a6cf3">CBMDistEventRef</a>

diff --git a/functions_t.html b/functions_t.html
@@ -130,7 +130,7 @@ <h3><a id="index_t"></a>- t -</h3><ul>
 : <a class="el" href="structmoja_1_1modules_1_1cbm_1_1DisturbanceData.html#a9dd53102c60347e356e7efc3cb017d8d">DisturbanceData</a>
 </li>
 <li>TransitionRule()
-: <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a481b7fb7e59ebdc5c58708e0f7687a38">TransitionRule</a>
+: <a class="el" href="classmoja_1_1modules_1_1cbm_1_1TransitionRule.html#a216e9c1db98a39f45f96844f063dd538">TransitionRule</a>
 </li>
 <li>transitionRuleId()
 : <a class="el" href="classmoja_1_1modules_1_1cbm_1_1CBMDistEventRef.html#a7fc2e9518423f2232842e453dd0bda78">CBMDistEventRef</a>

diff --git a/search/all_14.js b/search/all_14.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e7fdb2d6592e9c7184b29eed23380bcd
		027deb277bc1b7f590711b29b6b11523