summaryrefslogtreecommitdiffstats
path: root/src/removeoverlap/constraint.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/removeoverlap/constraint.cpp')
-rw-r--r--src/removeoverlap/constraint.cpp28
1 files changed, 23 insertions, 5 deletions
diff --git a/src/removeoverlap/constraint.cpp b/src/removeoverlap/constraint.cpp
index bb889c4d9..7c200878b 100644
--- a/src/removeoverlap/constraint.cpp
+++ b/src/removeoverlap/constraint.cpp
@@ -1,29 +1,47 @@
/**
- * \brief Remove overlaps function
+ * \brief A constraint determines a minimum or exact spacing required between
+ * two variables.
*
* Authors:
* Tim Dwyer <tgdwyer@gmail.com>
*
* Copyright (C) 2005 Authors
*
- * Released under GNU GPL. Read the file 'COPYING' for more information.
+ * Released under GNU LGPL. Read the file 'COPYING' for more information.
*/
#include "constraint.h"
#include <cassert>
-Constraint::Constraint(Variable *left, Variable *right, double gap)
+Constraint::Constraint(Variable *left, Variable *right, double gap, bool equality)
: left(left),
right(right),
gap(gap),
timeStamp(0),
active(false),
- visited(false)
+ visited(false),
+ equality(equality)
{
left->out.push_back(this);
right->in.push_back(this);
}
+Constraint::~Constraint() {
+ Constraints::iterator i;
+ for(i=left->out.begin(); i!=left->out.end(); i++) {
+ if(*i==this) break;
+ }
+ left->out.erase(i);
+ for(i=right->in.begin(); i!=right->in.end(); i++) {
+ if(*i==this) break;
+ }
+ right->in.erase(i);
+}
std::ostream& operator <<(std::ostream &os, const Constraint &c)
{
- os<<*c.left<<"+"<<c.gap<<"<="<<*c.right<<"("<<c.slack()<<"):lts="<<c.left->block->timeStamp<<",cts="<<c.timeStamp;
+ if(&c==NULL) {
+ os<<"NULL";
+ } else {
+ const char *type=c.equality?"=":"<=";
+ os<<*c.left<<"+"<<c.gap<<type<<*c.right<<"("<<c.slack()<<")"<<(c.active?"-active":"");
+ }
return os;
}