Changeset a07784 in git for Singular/CacheImplementation.h

Timestamp:

Dec 5, 2012, 4:03:45 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

ae900ff750a6fe0dbab70a5aa87cc48fc3dd280e

Parents:

b3646035aca6a8d660df952d443268649a51090907ff965ddd552fe3a981f417b2da928dca53a8f2

Message:

Merge branch 'spielwiese' of github.com:Singular/Sources into spielwiese-pyobject

File:

• Singular/CacheImplementation.h (modified) (15 diffs)

Singular/CacheImplementation.h

@@ -1 +1 @@
 #ifndef CACHE_IMPLEMENTATION_H
 #define CACHE_IMPLEMENTATION_H
+
+#include <reporter/reporter.h>
 
 #include <cstdio> // for sprintf
@@ -53 +55 @@
 {
   _itKey = _key.end(); // referring to past-the-end element in the list
-  typename list<KeyClass>::const_iterator itKey;
+   typename std::list<KeyClass>::const_iterator itKey;
   _itValue = _value.begin();
   /* As _key is a sorted list, the following could actually be implemented
@@ -80 +82 @@
        thus, getValue has been called although hasKey
        produced no match */
-    assert(false);
+    assume(false);
 
   return *_itValue;
@@ -123 +125 @@
      erasing the last entry which is only implemented for forward
      iterators by std::list. */
-  list<int>::iterator itRank;
+   std::list<int>::iterator itRank;
   for (itRank = _rank.begin(); itRank != _rank.end(); itRank++) { }
   itRank--; /* Now, this forward iterator points to the last list entry. */
@@ -132 +134 @@
   /* now delete entries in _key and _value with index deleteIndex */
   int k = 0;
-  typename list<KeyClass>::iterator itKey;
-  typename list<ValueClass>::iterator itValue = _value.begin();
-  typename list<int>::iterator itWeights = _weights.begin();
+  typename std::list<KeyClass>::iterator itKey;
+  typename std::list<ValueClass>::iterator itValue = _value.begin();
+  typename std::list<int>::iterator itWeights = _weights.begin();
   for (itKey = _key.begin(); itKey != _key.end(); itKey++)
   {
@@ -176 +178 @@
                                        keyWasContained == false */
   int k = 0;
-  typename list<KeyClass>::iterator itKey;
+  typename std::list<KeyClass>::iterator itKey;
   // itOldValue will later only be used in the case keyWasContained == true: */
-  typename list<ValueClass>::iterator itOldValue = _value.begin();
+  typename std::list<ValueClass>::iterator itOldValue = _value.begin();
   /* itOldWeights will later only be used in the case
      keyWasContained == true */
-  typename list<int>::iterator itOldWeights = _weights.begin();
+  typename std::list<int>::iterator itOldWeights = _weights.begin();
   for (itKey = _key.begin(); itKey != _key.end(); itKey++)
   {
@@ -203 +205 @@
   int newWeight = value.getWeight();
   k = 0;
-  typename list<ValueClass>::iterator itValue = _value.begin();
+  typename std::list<ValueClass>::iterator itValue = _value.begin();
   for (itValue = _value.begin(); itValue != _value.end(); itValue++)
   {
@@ -229 +231 @@
        _rank[oldIndexInRank] == oldIndexInKey, i.e.
        _key[_rank[oldIndexInRank]] == key: */
-    list<int>::iterator itRank;
+    std::list<int>::iterator itRank;
     k = 0;
     for (itRank = _rank.begin(); itRank != _rank.end(); itRank++)
@@ -306 +308 @@
        Let's make room for the assignment
        _rank[newIndexInRank] := newIndexInKey: */
-    list<int>::iterator itRank;
+    std::list<int>::iterator itRank;
     for (itRank = _rank.begin(); itRank != _rank.end(); itRank++)
     {
@@ -323 +325 @@
     /* let's insert new key and new value at index newIndexInKey: */
     itValue = _value.begin();
-    typename list<int>::iterator itWeights = _weights.begin();
+    typename std::list<int>::iterator itWeights = _weights.begin();
     k = 0;
     for (itKey = _key.begin(); itKey != _key.end(); itKey++)
@@ -344 +346 @@
                                  new (key, value)-pair */
 
-  assert(_rank.size() == _key.size());
-  assert(_rank.size() == _value.size());
+  assume(_rank.size() == _key.size());
+  assume(_rank.size() == _value.size());
   return !result; /* true iff the new (key --> value) pair is
                      actually in the cache now */
@@ -351 +353 @@
 
 template<class KeyClass, class ValueClass>
-string Cache<KeyClass, ValueClass>::toString() const
+std::string Cache<KeyClass, ValueClass>::toString() const
 {
   char h[10];
-  string s = "Cache:";
+  std::string s = "Cache:";
   s += "\n   entries: ";
   sprintf(h, "%d", getNumberOfEntries()); s += h;
@@ -371 +373 @@
     int k = 1;
     s += "\n   (key --> value) pairs in ascending order of keys:";
-    typename list<KeyClass>::const_iterator itKey;
-    typename list<ValueClass>::const_iterator itValue = _value.begin();
+    typename std::list<KeyClass>::const_iterator itKey;
+    typename std::list<ValueClass>::const_iterator itValue = _value.begin();
     for (itKey = _key.begin(); itKey != _key.end(); itKey++)
     {
@@ -385 +387 @@
     }
     s += "\n   (key --> value) pairs in descending order of ranks:";
-    list<int>::const_iterator itRank;
+    std::list<int>::const_iterator itRank;
     int r = 1;
     for (itRank = _rank.begin(); itRank != _rank.end(); itRank++)
@@ -413 +415 @@
 void Cache<KeyClass, ValueClass>::print() const
 {
-  cout << this->toString();
+  PrintS(this->toString().c_str());
 }