From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 22 May 2021 04:44:24 +0000 (-0700)
Subject: pass Rectangles to generateYConstraints as vector of values instead of pointers
X-Git-Tag: 2.47.3~25^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b626e0882540ad73644dd5992d28ed377b1288c;p=graphviz

pass Rectangles to generateYConstraints as vector of values instead of pointers

This allows a number of simplifications, most importantly removing manual
allocations in genYConstraints.
---

diff --git a/lib/vpsc/csolve_VPSC.cpp b/lib/vpsc/csolve_VPSC.cpp
index 95f4ed2ce..8e44fa63a 100644
--- a/lib/vpsc/csolve_VPSC.cpp
+++ b/lib/vpsc/csolve_VPSC.cpp
@@ -47,14 +47,11 @@ int genXConstraints(int n, boxf* bb, Variable** vs, Constraint*** cs,int transit
 	return m;
 }
 int genYConstraints(int n, boxf* bb, Variable** vs, Constraint*** cs) {
-	std::vector<Rectangle*> rs(n);
+	std::vector<Rectangle> rs;
 	for(int i=0;i<n;i++) {
-		rs[i]=new Rectangle(bb[i].LL.x,bb[i].UR.x,bb[i].LL.y,bb[i].UR.y);
+		rs.emplace_back(bb[i].LL.x,bb[i].UR.x,bb[i].LL.y,bb[i].UR.y);
 	}
 	int m = generateYConstraints(rs,vs,*cs);
-	for(int i=0;i<n;i++) {
-		delete rs[i];
-	}
 	return m;
 }
 
diff --git a/lib/vpsc/generate-constraints.cpp b/lib/vpsc/generate-constraints.cpp
index 1b6768b24..50a558d0a 100644
--- a/lib/vpsc/generate-constraints.cpp
+++ b/lib/vpsc/generate-constraints.cpp
@@ -217,16 +217,16 @@ int generateXConstraints(const vector<Rectangle> &rs, Variable** vars,
 /**
  * Prepares constraints in order to apply VPSC vertically to remove ALL overlap.
  */
-int generateYConstraints(const vector<Rectangle*> &rs, Variable** vars,
+int generateYConstraints(const vector<Rectangle> &rs, Variable** vars,
 	  Constraint** &cs) {
 
 	vector<Event> events;
 	events.reserve(2 * rs.size());
 	for(size_t i=0;i<rs.size();i++) {
-		vars[i]->desiredPosition=rs[i]->getCentreY();
-		Node *v = new Node(vars[i],*rs[i],rs[i]->getCentreY());
-		events.emplace_back(Open,v,rs[i]->getMinX());
-		events.emplace_back(Close,v,rs[i]->getMaxX());
+		vars[i]->desiredPosition=rs[i].getCentreY();
+		Node *v = new Node(vars[i],rs[i],rs[i].getCentreY());
+		events.emplace_back(Open,v,rs[i].getMinX());
+		events.emplace_back(Close,v,rs[i].getMaxX());
 	}
 	std::sort(events.begin(), events.end(), compare_events);
 	NodeSet scanline;
diff --git a/lib/vpsc/generate-constraints.h b/lib/vpsc/generate-constraints.h
index 591ddec32..2e9580319 100644
--- a/lib/vpsc/generate-constraints.h
+++ b/lib/vpsc/generate-constraints.h
@@ -79,5 +79,5 @@ struct Constraint;
 // returns number of constraints generated
 int generateXConstraints(const std::vector<Rectangle> &rs, Variable** vars,
 	Constraint** &cs, const bool useNeighbourLists);
-int generateYConstraints(const std::vector<Rectangle*> &rs, Variable** vars,
+int generateYConstraints(const std::vector<Rectangle> &rs, Variable** vars,
 	Constraint** &cs);