fix unify, remove test_choice from pred, merge solve into main in send_more_money

Author: pjritee

CMakeLists.txt

@@ -22,7 +22,6 @@ include_directories(include)
 set(SOURCES
     src/term.cpp
     src/pvar.cpp
-#    src/p_lessthan.cpp
     src/pred.cpp
     src/engine.cpp
 )

Doxyfile

@@ -2,7 +2,7 @@
 
 # Project related settings
 PROJECT_NAME           = PLSearchCPP
-PROJECT_NUMBER         = 1.0
+PROJECT_NUMBER         = 1.1
 OUTPUT_DIRECTORY       = docs
 GENERATE_HTML          = YES
 GENERATE_LATEX         = NO

README.md

@@ -63,4 +63,13 @@ Documentation can be found here [docs/index.html](https://pjritee.github.io/pl_s
 
 ## License
 
-This project is licensed under the MIT License - see the LICENSE file for details.
+This project is licensed under the MIT License - see the LICENSE file for details.
+
+## Version History
+
+* 1.1 
+  - Fix problems in unify
+  - Remove the test_choice method from Pred
+  - merge solve into main in send_more_money.cpp for better testing with valgrind
+* 1.0  
+  - Initial release.

docs/html/annotated.html

@@ -21,7 +21,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.0</span>
+   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.1</span>
    </div>
   </td>
  </tr>

docs/html/choice__iterator_8hpp.html

@@ -21,7 +21,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.0</span>
+   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.1</span>
    </div>
   </td>
  </tr>

docs/html/choice__iterator_8hpp_source.html

@@ -21,7 +21,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.0</span>
+   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.1</span>
    </div>
   </td>
  </tr>
@@ -127,7 +127,7 @@
 <div class="foldopen" id="foldopen00075" data-start="{" data-end="}">
 <div class="line"><a id="l00075" name="l00075"></a><span class="lineno"><a class="line" href="classpl__search_1_1VarChoiceIterator.html#a09ddc846ce198a54c2ff66e3b1bdbff3">   75</a></span>  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code hl_function" href="classpl__search_1_1VarChoiceIterator.html#a09ddc846ce198a54c2ff66e3b1bdbff3">make_choice</a>()<span class="keyword"> override </span>{</div>
 <div class="line"><a id="l00076" name="l00076"></a><span class="lineno">   76</span>    <a class="code hl_typedef" href="namespacepl__search.html#aefab13fe8a24c420b9a3b2792e5d0cb7">TermPtr</a> t = <a class="code hl_variable" href="classpl__search_1_1VarChoiceIterator.html#a4ba33c33a20ae360e09e71a147a4d4f5">choices</a>[<a class="code hl_variable" href="classpl__search_1_1VarChoiceIterator.html#a79bcaea34963465ccdbdd71f8fce476c">index</a>++];</div>
-<div class="line"><a id="l00077" name="l00077"></a><span class="lineno">   77</span>    <span class="keywordflow">return</span> <a class="code hl_variable" href="classpl__search_1_1VarChoiceIterator.html#af557b6f1a2177f6ec6edebab0d7be2f7">engine</a>-&gt;<a class="code hl_function" href="classpl__search_1_1Engine.html#a125fffbb1bb9cfceafd79824dba99ddb">unify</a>(<a class="code hl_variable" href="classpl__search_1_1VarChoiceIterator.html#aae20a6e065f77dd530ce1567847195d8">var</a>, t) &amp;&amp; <a class="code hl_function" href="classpl__search_1_1ChoiceIterator.html#aafebb73a1fb859eff33ab999e835c770">test_choice</a>();</div>
+<div class="line"><a id="l00077" name="l00077"></a><span class="lineno">   77</span>    <span class="keywordflow">return</span> <a class="code hl_variable" href="classpl__search_1_1VarChoiceIterator.html#af557b6f1a2177f6ec6edebab0d7be2f7">engine</a>-&gt;<a class="code hl_function" href="classpl__search_1_1Engine.html#a125fffbb1bb9cfceafd79824dba99ddb">unify</a>(<a class="code hl_variable" href="classpl__search_1_1VarChoiceIterator.html#aae20a6e065f77dd530ce1567847195d8">var</a>, t)  &amp;&amp; <a class="code hl_function" href="classpl__search_1_1ChoiceIterator.html#aafebb73a1fb859eff33ab999e835c770">test_choice</a>();</div>
 <div class="line"><a id="l00078" name="l00078"></a><span class="lineno">   78</span>  }</div>
 </div>
 <div class="line"><a id="l00079" name="l00079"></a><span class="lineno">   79</span> </div>
@@ -144,12 +144,12 @@
 <div class="line"><a id="l00088" name="l00088"></a><span class="lineno">   88</span> </div>
 <div class="line"><a id="l00089" name="l00089"></a><span class="lineno">   89</span><span class="preprocessor">#endif </span><span class="comment">// PL_SEARCH_CHOICE_ITERATOR_HPP</span></div>
 <div class="ttc" id="aclasspl__search_1_1ChoiceIterator_html"><div class="ttname"><a href="classpl__search_1_1ChoiceIterator.html">pl_search::ChoiceIterator</a></div><div class="ttdoc">Base class for choice iterators.</div><div class="ttdef"><b>Definition</b> choice_iterator.hpp:23</div></div>
-<div class="ttc" id="aclasspl__search_1_1ChoiceIterator_html_aafebb73a1fb859eff33ab999e835c770"><div class="ttname"><a href="classpl__search_1_1ChoiceIterator.html#aafebb73a1fb859eff33ab999e835c770">pl_search::ChoiceIterator::test_choice</a></div><div class="ttdeci">virtual bool test_choice()</div><div class="ttdoc">Tests a choice which would tyically involve constraint dedections based on the choice.</div><div class="ttdef"><b>Definition</b> choice_iterator.hpp:42</div></div>
+<div class="ttc" id="aclasspl__search_1_1ChoiceIterator_html_aafebb73a1fb859eff33ab999e835c770"><div class="ttname"><a href="classpl__search_1_1ChoiceIterator.html#aafebb73a1fb859eff33ab999e835c770">pl_search::ChoiceIterator::test_choice</a></div><div class="ttdeci">virtual bool test_choice()</div><div class="ttdoc">Tests a choice which would tyically involve constraint deductions based on the choice.</div><div class="ttdef"><b>Definition</b> choice_iterator.hpp:42</div></div>
 <div class="ttc" id="aclasspl__search_1_1ChoiceIterator_html_aaff91d7bee6d1306331159d335bc92c9"><div class="ttname"><a href="classpl__search_1_1ChoiceIterator.html#aaff91d7bee6d1306331159d335bc92c9">pl_search::ChoiceIterator::has_next</a></div><div class="ttdeci">virtual bool has_next()=0</div><div class="ttdoc">Checks if there are more choices available.</div></div>
 <div class="ttc" id="aclasspl__search_1_1ChoiceIterator_html_ad400ba45b9317b14ec859c64113563c0"><div class="ttname"><a href="classpl__search_1_1ChoiceIterator.html#ad400ba45b9317b14ec859c64113563c0">pl_search::ChoiceIterator::~ChoiceIterator</a></div><div class="ttdeci">virtual ~ChoiceIterator()=default</div><div class="ttdoc">Virtual destructor for proper cleanup.</div></div>
 <div class="ttc" id="aclasspl__search_1_1ChoiceIterator_html_ae82d2a16c8299ec5981afce491ee2d13"><div class="ttname"><a href="classpl__search_1_1ChoiceIterator.html#ae82d2a16c8299ec5981afce491ee2d13">pl_search::ChoiceIterator::make_choice</a></div><div class="ttdeci">virtual bool make_choice()=0</div><div class="ttdoc">Makes a choice.</div></div>
 <div class="ttc" id="aclasspl__search_1_1Engine_html"><div class="ttname"><a href="classpl__search_1_1Engine.html">pl_search::Engine</a></div><div class="ttdoc">The Engine class manages the execution of predicates and backtracking.</div><div class="ttdef"><b>Definition</b> engine.hpp:69</div></div>
-<div class="ttc" id="aclasspl__search_1_1Engine_html_a125fffbb1bb9cfceafd79824dba99ddb"><div class="ttname"><a href="classpl__search_1_1Engine.html#a125fffbb1bb9cfceafd79824dba99ddb">pl_search::Engine::unify</a></div><div class="ttdeci">bool unify(TermPtr t1, TermPtr t2)</div><div class="ttdoc">Unifies two terms.</div><div class="ttdef"><b>Definition</b> engine.cpp:71</div></div>
+<div class="ttc" id="aclasspl__search_1_1Engine_html_a125fffbb1bb9cfceafd79824dba99ddb"><div class="ttname"><a href="classpl__search_1_1Engine.html#a125fffbb1bb9cfceafd79824dba99ddb">pl_search::Engine::unify</a></div><div class="ttdeci">bool unify(TermPtr t1, TermPtr t2)</div><div class="ttdoc">Unifies two terms.</div><div class="ttdef"><b>Definition</b> engine.cpp:75</div></div>
 <div class="ttc" id="aclasspl__search_1_1PVar_html"><div class="ttname"><a href="classpl__search_1_1PVar.html">pl_search::PVar</a></div><div class="ttdoc">Represents a Prolog variable.</div><div class="ttdef"><b>Definition</b> pvar.hpp:44</div></div>
 <div class="ttc" id="aclasspl__search_1_1VarChoiceIterator_html"><div class="ttname"><a href="classpl__search_1_1VarChoiceIterator.html">pl_search::VarChoiceIterator</a></div><div class="ttdoc">Choice iterator for variables.</div><div class="ttdef"><b>Definition</b> choice_iterator.hpp:53</div></div>
 <div class="ttc" id="aclasspl__search_1_1VarChoiceIterator_html_a09ddc846ce198a54c2ff66e3b1bdbff3"><div class="ttname"><a href="classpl__search_1_1VarChoiceIterator.html#a09ddc846ce198a54c2ff66e3b1bdbff3">pl_search::VarChoiceIterator::make_choice</a></div><div class="ttdeci">virtual bool make_choice() override</div><div class="ttdoc">Makes a choice.</div><div class="ttdef"><b>Definition</b> choice_iterator.hpp:75</div></div>

docs/html/classes.html

@@ -21,7 +21,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.0</span>
+   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.1</span>
    </div>
   </td>
  </tr>

docs/html/classpl__search_1_1CList-members.html

@@ -21,7 +21,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.0</span>
+   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.1</span>
    </div>
   </td>
  </tr>

docs/html/classpl__search_1_1CList.html

@@ -21,7 +21,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.0</span>
+   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.1</span>
    </div>
   </td>
  </tr>

docs/html/classpl__search_1_1ChoiceIterator-members.html

@@ -21,7 +21,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.0</span>
+   <div id="projectname">PLSearchCPP<span id="projectnumber">&#160;1.1</span>
    </div>
   </td>
  </tr>