Commit 01b5859

committed

Corrected reference to readInput

1 parent 4e17add commit 01b5859Copy full SHA for 01b5859

File tree

2 files changed

+15

-12

lines changed

examples/convexhull/include
- convexHullExtras.hpp
extras
- stackAlgoExtras.hpp

2 files changed

+15

-12

lines changed

`‎examples/convexhull/include/convexHullExtras.hpp‎`

Lines changed: 14 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,21 +63,22 @@ Point2D ConvexHullExtras<I>::readInput(std::vector<std::string> line) {`
`63`	`63`
`64`	`64`	`Point2D p(x, y);`
`65`	`65`
`66`		`- //std::cout << "I JUST READ " << p << std::endl;`
	`66`	`+ //std::cout << "I JUST READ " << p << std::endl;`
`67`	`67`
`68`	`68`	`return p;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`template <class I>`
`72`	`72`	`std::shared_ptr<emptyContext> ConvexHullExtras<I>::initStack() {`
`73`		`- // std::cout << "going to read two values " << std::endl;`
	`73`	`+ // std::cout << "going to read two values " << std::endl;`
`74`	`74`
`75`	`75`	`// first, read and push two values`
`76`		`- StackAlgoExtras<emptyContext, Point2D, I>::readPush(2);`
	`76`	`+ StackAlgoExtras<emptyContext, Point2D, I>::readPushCompare();`
	`77`	`+ StackAlgoExtras<emptyContext, Point2D, I>::readPushCompare();`
`77`	`78`
`78`	`79`	`// StackAlgoExtras<emptyContext, Point2D, I>::printCompare();`
`79`	`80`
`80`		`- //std::cout << "done reading two values " << std::endl;`
	`81`	`+ //std::cout << "done reading two values " << std::endl;`
`81`	`82`	`// then initialize context (which in this case is NULL everything`
`82`	`83`	`std::shared_ptr<emptyContext> context;`
`83`	`84`	`return context;`
`@@ -86,40 +87,42 @@ std::shared_ptr<emptyContext> ConvexHullExtras<I>::initStack() {`
`86`	`87`	`template <class I> bool ConvexHullExtras<I>::popCondition(Point2D last) {`
`87`	`88`	`Point2D minus1, minus2;`
`88`	`89`
`89`		`- // std::cout << last << " <<<< pop condition enter " << std::endl;`
	`90`	`+ // std::cout << last << " <<<< pop condition enter " << std::endl;`
`90`	`91`
`91`	`92`	`// read the two previous elements`
`92`	`93`	`minus1 = StackAlgoExtras<emptyContext, Point2D, I>::top(1).getData();`
`93`	`94`	`minus2 = StackAlgoExtras<emptyContext, Point2D, I>::top(2).getData();`
`94`	`95`
`95`		`- // std::cout << last << " <<<< pop condition read two before " << minus1<< minus2 << std::endl;`
	`96`	`+ // std::cout << last << " <<<< pop condition read two before " << minus1<<`
	`97`	`+ // minus2 << std::endl;`
`96`	`98`
`97`	`99`	`if (Point2D::orientation(minus2, minus1, last) == 2) {`
`98`		`- // std::cout << last << " <<<< pop condition returning true " << std::endl;`
	`100`	`+ // std::cout << last << " <<<< pop condition returning true " << std::endl;`
`99`	`101`
`100`	`102`	`return true;`
`101`	`103`	`}`
`102`		`- // std::cout << last << " <<<< pop condition returning false " << std::endl;`
	`104`	`+ // std::cout << last << " <<<< pop condition returning false " << std::endl;`
`103`	`105`
`104`	`106`	`return false;`
`105`	`107`	`}`
`106`	`108`	`template <class I> void ConvexHullExtras<I>::prePop(Point2D data) {}`
`107`	`109`	`template <class I>`
`108`	`110`	`void ConvexHullExtras<I>::postPop(Point2D data,`
`109`	`111`	`Data<emptyContext, Point2D, I> elt) {`
`110`		`- // std::cout << elt.getData() << " <<<< Pop!" << std::endl;`
	`112`	`+ // std::cout << elt.getData() << " <<<< Pop!" << std::endl;`
`111`	`113`	`}`
`112`	`114`	`template <class I> void ConvexHullExtras<I>::noPop(Point2D data) {}`
`113`	`115`
`114`	`116`	`template <class I> bool ConvexHullExtras<I>::pushCondition(Point2D data) {`
`115`		`- // std::cout << data << " <<<< push condition returning true " << std::endl;`
	`117`	`+ // std::cout << data << " <<<< push condition returning true " << std::endl;`
`116`	`118`	`return true;`
`117`	`119`	`}`
`118`	`120`	`template <class I>`
`119`	`121`	`void ConvexHullExtras<I>::prePush(Data<emptyContext, Point2D, I> elt) {}`
`120`	`122`	`template <class I>`
`121`	`123`	`void ConvexHullExtras<I>::postPush(Data<emptyContext, Point2D, I> elt) {`
`122`		`- //std::cout << "ConvexHullStackAlgo::pushAction Nothing to see here " << elt.getData() << std::endl;`
	`124`	`+ // std::cout << "ConvexHullStackAlgo::pushAction Nothing to see here " <<`
	`125`	`+ // elt.getData() << std::endl;`
`123`	`126`	`}`
`124`	`127`	`template <class I> void ConvexHullExtras<I>::noPush(Point2D data) {}`
`125`	`128`

`‎extras/stackAlgoExtras.hpp‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ void StackAlgoExtras<T, D, I>::readPushCompare(I iter) {`
`180`	`180`	`std::streampos position = StackAlgo<T, D, I>::mInput.tellg();`
`181`	`181`	`StackAlgo<T, D, I>::mStack->setPosition(position);`
`182`	`182`	`std::vector<std::string> line = StackAlgo<T, D, I>::readLine();`
`183`		`- D data = StackAlgo<T, D, I>::readInput(line);`
	`183`	`+ D data = readInput(line);`
`184`	`184`	`StackAlgo<T, D, I>::mIndex++;`
`185`	`185`	`Data<T, D, I> elt(StackAlgo<T, D, I>::mIndex, data);`
`186`	`186`	`pushAction(elt);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 01b5859

File tree

2 files changed

2 files changed

`‎examples/convexhull/include/convexHullExtras.hpp‎`

`‎extras/stackAlgoExtras.hpp‎`

0 commit comments