Changeset 519eaf5 for src/dgp/boubble.hh

Timestamp:

03/30/14 23:59:06 (11 years ago)

Author:

Tomasz Obrebski <obrebski@…>

Branches:

master

Children:

0a58b3f

Parents:

f924e4b

git-author:

Tomasz Obrebski <obrebski@…> (03/30/14 23:59:06)

git-committer:

Tomasz Obrebski <obrebski@…> (03/30/14 23:59:06)

Message:

Bug fixes: bubbles,props

File:

• src/dgp/boubble.hh (modified) (11 diffs)

src/dgp/boubble.hh

@@ -24 +24 @@
 {
 public:
-  Boubble(list<Role> u, list<Role> d, LongRel l, int s=-1);
-  Boubble(const char* pathstr, const char* l, int s=-1);
-  //  Boubble(const Boubble& b) {_src=b._src; _upath=b._upath; _dpath=b._dpath; _rel=b._rel; };
-
-  Dir dir();
-  LongRel rel();
-  int src();
+  Boubble() {};
+  Boubble(list<Role> u, list<Role> d, LongRel l, int s=-1, bool r=false);
+  Boubble(const char* pathstr, const char* l, int s=-1, bool r=false);
+  //Boubble(const Boubble& b) {_src=b._src; _upath=b._upath; _dpath=b._dpath; _rel=b._rel; _reverse=b._reverse; };
+
+  Dir dir() const;
+  LongRel rel() const;
+  int src() const;
   void src(int s);
+  bool reverse() const;
+  void reverse(bool b);
 
   Role next();
 
   Boubble* step(Role r, Dir d);
-  
-  bool is_at_target();
+  Boubble* reversed();
+  
+  bool is_at_target() const;
 
   bool operator==(Boubble const& b) const;
@@ -52 +56 @@
   list<Role>           _dpath;
   LongRel              _rel;
+  bool                 _reverse;
 
 };
@@ -58 +63 @@
 
 inline
-Boubble::Boubble(list<Role> u, list<Role> d, LongRel l, int s) : _upath(u), _dpath(d), _rel(l), _src(s) {}
-
-//----------------------------------------------------------------------------------------------------
-
-inline
-Boubble::Boubble(const char* pathstr, const char* l, int s)
+Boubble::Boubble(list<Role> u, list<Role> d, LongRel l, int s, bool r)
+  : _upath(u), _dpath(d), _rel(l), _src(s), _reverse(r) {}
+
+//----------------------------------------------------------------------------------------------------
+
+inline
+Boubble::Boubble(const char* pathstr, const char* l, int s, bool r)
 {
   Dir dir = UP;
@@ -83 +89 @@
   _rel = LongRel(l);
   _src = s;
-}
-
-//----------------------------------------------------------------------------------------------------
-
-inline
-Dir Boubble::dir()
+  _reverse = r;
+}
+
+//----------------------------------------------------------------------------------------------------
+
+inline
+Dir Boubble::dir() const
 { 
   if(!_upath.empty())
@@ -100 +107 @@
 
 inline
-LongRel Boubble::rel()
+LongRel Boubble::rel() const
 { return _rel; }
 
@@ -106 +113 @@
 
 inline
-int Boubble::src()
+int Boubble::src() const
 { return _src; }
 
@@ -114 +121 @@
 void Boubble::src(int s)
 { _src=s; }
+
+//----------------------------------------------------------------------------------------------------
+
+inline
+bool Boubble::reverse() const
+{ return _reverse; }
+
+//----------------------------------------------------------------------------------------------------
+
+inline
+void Boubble::reverse(bool b)
+{ _reverse=b; }
 
 //----------------------------------------------------------------------------------------------------
@@ -134 +153 @@
   if(d==UP && !_upath.empty() && _upath.front() == r)
     {
-      Boubble* newboubble = new Boubble(_upath,_dpath,_rel,_src);
+      Boubble* newboubble = new Boubble(_upath,_dpath,_rel,_src,_reverse);
       newboubble->_upath.pop_front();
       return newboubble;
@@ -141 +160 @@
   if(d==DOWN && _upath.empty() && !_dpath.empty() && _dpath.front() == r)
     {
-      Boubble* newboubble = new Boubble(_upath,_dpath,_rel,_src);
+      Boubble* newboubble = new Boubble(_upath,_dpath,_rel,_src,_reverse);
       newboubble->_dpath.pop_front();
       return newboubble;
@@ -151 +170 @@
 
 inline
-bool Boubble::is_at_target()
+Boubble* Boubble::reversed()
+{
+  Boubble* newboubble = new Boubble(_dpath,_upath,_rel,-1,!_reverse);
+  newboubble->_upath.reverse();
+  newboubble->_dpath.reverse();
+  // cout << *this << "-----" << *newboubble << endl;
+  return newboubble;
+}
+
+//----------------------------------------------------------------------------------------------------
+
+inline
+bool Boubble::is_at_target() const
 { return _upath.empty() && _dpath.empty(); }
 
@@ -208 +239 @@
   o << b._rel.str();
   o << "]";
+  if(b.reverse()) o << "!";
+  return o;
 }