From 2633767789e4264b13ef91a684accf734fb4e94f Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 26 Oct 2011 21:55:51 -0700 Subject: Fixing more broken and split doc comments. (bzr r10697) --- src/libvpsc/blocks.cpp | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'src/libvpsc/blocks.cpp') diff --git a/src/libvpsc/blocks.cpp b/src/libvpsc/blocks.cpp index fe0caacfc..7eff1e6c4 100644 --- a/src/libvpsc/blocks.cpp +++ b/src/libvpsc/blocks.cpp @@ -1,9 +1,5 @@ -/** - * \brief A block structure defined over the variables - * - * A block structure defined over the variables such that each block contains - * 1 or more variables, with the invariant that all constraints inside a block - * are satisfied by keeping the variables fixed relative to one another +/* + * A block structure defined over the variables. * * Authors: * Tim Dwyer @@ -47,10 +43,6 @@ Blocks::~Blocks(void) clear(); } -/** - * returns a list of variables with total ordering determined by the constraint - * DAG - */ list *Blocks::totalOrder() { list *order = new list; for(int i=0;i *order) { #endif order->push_front(v); } -/** - * Processes incoming constraints, most violated to least, merging with the - * neighbouring (left) block until no more violated constraints are found - */ + void Blocks::mergeLeft(Block *r) { #ifdef RECTANGLE_OVERLAP_LOGGING ofstream f(LOGFILE,ios::app); @@ -115,9 +104,7 @@ void Blocks::mergeLeft(Block *r) { f<<"merged "<<*r<split(l,r,c); #ifdef RECTANGLE_OVERLAP_LOGGING @@ -184,10 +168,7 @@ void Blocks::split(Block *b, Block *&l, Block *&r, Constraint *c) { insert(l); insert(r); } -/** - * returns the cost total squared distance of variables from their desired - * positions - */ + double Blocks::cost() { double c = 0; for(set::iterator i=begin();i!=end();++i) { -- cgit v1.2.3