standardize names a little

[model-checker.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index 6eb71dc89c8f15097514781ed95209304414d1f6..4ece1820ab86b35baad7c6ec1c7ee18b1a19c61b 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -27,7 +27,7 @@ Node::Node(ModelAction *act, Node *par, int nthreads)
        may_read_from(),
        read_from_index(0),
        future_values(),
-       future_index(0)
+       future_index(-1)
 {
        if (act)
                act->set_node(this);
@@ -67,22 +67,22 @@ bool Node::get_promise(uint32_t i) {
        return (promises[i]==2);
 }
 
-bool Node::increment_promises() {
+bool Node::increment_promise() {
        for (unsigned int i=0;i<promises.size();i++) {
                if (promises[i]==1) {
                        promises[i]=2;
-                       do {
+                       while (i>0) {
                                i--;
                                if (promises[i]==2)
                                        promises[i]=1;
-                       } while(i>0);
+                       }
                        return true;
                }
        }
        return false;
 }
 
-bool Node::promises_empty() {
+bool Node::promise_empty() {
        for (unsigned int i=0;i<promises.size();i++)
                if (promises[i]==1)
                        return false;
@@ -98,6 +98,7 @@ bool Node::add_future_value(uint64_t value) {
        for(unsigned int i=0;i<future_values.size();i++)
                if (future_values[i]==value)
                        return false;
+
        future_values.push_back(value);
        return true;
 }
@@ -107,7 +108,7 @@ bool Node::add_future_value(uint64_t value) {
  * @return true if the future_values set is empty.
  */
 
-bool Node::futurevalues_empty() {
+bool Node::future_value_empty() {
        return ((future_index+1)>=future_values.size());
 }
 
@@ -139,7 +140,7 @@ bool Node::backtrack_empty()
  * Checks whether the readsfrom set for this node is empty.
  * @return true if the readsfrom set is empty.
  */
-bool Node::readsfrom_empty() {
+bool Node::read_from_empty() {
        return ((read_from_index+1)>=may_read_from.size());
 }
 
@@ -239,7 +240,7 @@ bool Node::increment_read_from() {
  * @return Returns false if we have explored all values.
  */
 
-bool Node::increment_future_values() {
+bool Node::increment_future_value() {
        future_index++;
        return (future_index<future_values.size());
 }