diff --git a/src/nodeset.h b/src/nodeset.h --- a/src/nodeset.h +++ b/src/nodeset.h @@ -32,66 +32,65 @@ #include "node.h" class NodeSet : public list { - + public: NodeSet(void) { done = false; } - + inline bool DoneP(void) { return done; } inline void ResetDone(void) { done = false; } - + void AddNode(Node * n) { push_back(n); n->node_set = this; } list getCells(void) { - + list cellset; - + for (list::const_iterator i=begin(); i!=end(); i++) { transform ( (*i)->owners.begin(), (*i)->owners.end(), back_inserter( cellset ) , mem_fun_ref ( &Neighbor::getCell )); } - + cellset.sort(); - + // remove all non-unique elements // (unique moves all unique elements to the front and returns an iterator to the end of the unique elements; // so we simply erase all remaining elements. - cellset.erase(::unique(cellset.begin(), cellset.end() ), - cellset.end() ); - + cellset.erase(::unique(cellset.begin(), cellset.end() ), cellset.end() ); + // remove boundary_polygon cellset.erase( find_if ( cellset.begin(), cellset.end(), mem_fun( &Cell::BoundaryPolP ) ) ); return cellset; } void CleanUp(void) { - + // remove double Nodes from the set sort(); erase(::unique(begin(), end() ), - end() ); - - + end() ); + + } void print(ostream &os) const { transform( begin(), end(), ostream_iterator( os, " " ), mem_fun( &Node::Index ) ); } - + /*! Attempt a move over (rx, ry) reject if energetically unfavourable. */ void AttemptMove(double rx, double ry) { - + done = true; // 1. Collect list of all attached to the nodes in the set list celllist = getCells(); - + // 2. Sum the current energy of these cells double old_energy=0.; double sum_stiff = 0.; @@ -102,60 +101,57 @@ class NodeSet : public list { old_energy += (*i)->Energy(); sum_stiff += (*i)->Stiffness(); } - + // 3. (Temporarily) move the set's nodes. for ( list::iterator n = begin(); n!=end(); ++n ) { - + (*n)->x+=rx; (*n)->y+=ry; // (*n)->z += rz; - } - + // 4. Recalculate the energy double new_energy = 0.; for ( list::const_iterator i = celllist.begin(); i!=celllist.end(); ++i ) { - + new_energy += (*i)->Energy(); } - - + + // 5. Accept or Reject DeltaH - double dh = new_energy - old_energy; - - list new_areas; - - // cerr << "Nodeset says: dh = " << dh << " ..."; - if (dh < -sum_stiff || RANDOM() new_areas; + + // cerr << "Nodeset says: dh = " << dh << " ..."; + if (dh < -sum_stiff || RANDOM()::iterator n = begin(); n!= end(); ++n ) { - + (*n)->x-=rx; (*n)->y-=ry; - } - - + } } } - + void XMLAdd(xmlNode *root) const; void XMLRead(xmlNode *root, Mesh *m); private: @@ -164,3 +160,5 @@ class NodeSet : public list { ostream &operator<<(ostream &os, const NodeSet &ns); #endif + +/* finis */