[GL] Introducing class LineSegment. #1139

TomFischer · 2016-04-13T12:35:21Z

PR improves the existing class LineSegment and establishs it at some places in the GeoLib. The changes should improve the readability.

Furthermore the PR introduces a SegmentIterator in class Polyline. The iterator class allows to use algorithms from the standard library and makes the code more readable at some places.

ogsbot · 2016-04-14T11:08:43Z

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1439/

ogsbot · 2016-04-14T11:10:05Z

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1462/

TomFischer · 2016-04-15T08:35:26Z

Just let you know the status of the PR:

The testrunner is failing under Windows builds.
The testrunner is running fine under Mac and linux builds.
The Clang sanitizer under linux reports some mem leaks. These issues seems to be Qt related.
Valgrind kills the program because of an instruction valgrind does not understand. The place where this is reported is related to the test that is failing under Windows. A snippet of the valgrind message is below. Maybe someone has an idea to find the bug?

valgrind: Unrecognised instruction at address 0x136f6ad5.
at 0x136F6AD5: std::(anonymous namespace)::__x86_rdrand() (random.cc:69)
by 0x136F6C71: std::random_device::_M_getval() (random.cc:130)
by 0xD40864: std::random_device::operator()() (in /home/fischeth/w/OGS-6/BuildDebugWithCLangGui/bin/testrunner)
by 0xD40217: autocheck::rng() (generator.hpp:20)
by 0xE539F7: autocheck::generator<double, void>::operator()(unsigned long) (generator.hpp:162)
by 0xE53798: autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> >::operator()(unsigned long) (AutoCheckGenerators.h:38)
by 0xE53537: autocheck::SymmSegmentGeneratorXY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > >::operator()(unsigned long) (AutoCheckGenerato rs.h:71)
by 0xE5341A: std::tuple<GeoLib::LineSegment, GeoLib::LineSegment> autocheck::generate<std::tuple<GeoLib::LineSegment, GeoLib::LineSegment>, autocheck::SymmSegmentGenerator XY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > >, autocheck::SymmSegmentGeneratorXY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double , void> > >, 0, 1>(std::tuple<autocheck::SymmSegmentGeneratorXY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > >, autocheck::SymmSegmentGeneratorXY<autoch eck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > > >&, unsigned long, autocheck::range<0, 0, 1> const&) (generator.hpp:28)
by 0xE52E07: std::tuple<GeoLib::LineSegment, GeoLib::LineSegment> autocheck::generate<std::tuple<GeoLib::LineSegment, GeoLib::LineSegment>, autocheck::SymmSegmentGenerator XY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > >, autocheck::SymmSegmentGeneratorXY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double , void> > > >(std::tuple<autocheck::SymmSegmentGeneratorXY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > >, autocheck::SymmSegmentGeneratorXY<autocheck:: RandomCirclePointGeneratorXY<autocheck::generator<double, void> > > >&, unsigned long) (in /home/fischeth/w/OGS-6/BuildDebugWithCLangGui/bin/testrunner)
by 0xE526A0: autocheck::arbitrary<autocheck::SymmSegmentGeneratorXY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > >, autocheck::SymmSegmentG eneratorXY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > > >::operator()(autocheck::value<std::tuple<GeoLib::LineSegment, GeoLib::LineSegment> >&) (arbit rary.hpp:50)
by 0xE4D2B1: void autocheck::check<GeoLib::LineSegment, GeoLib::LineSegment, LineSegmentIntersect2dTest_RandomSegmentOrientationIntersecting_Test::TestBody()::$_0, autoche ck::arbitrary<autocheck::SymmSegmentGeneratorXY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > >, autocheck::SymmSegmentGeneratorXY<autocheck::RandomCircl ePointGeneratorXY<autocheck::generator<double, void> > > > >(LineSegmentIntersect2dTest_RandomSegmentOrientationIntersecting_Test::TestBody()::$_0, unsigned long, autocheck::arbitrary< autocheck::SymmSegmentGeneratorXY<autocheck::RandomCirclePointGeneratorXY<autocheck::generator<double, void> > >, autocheck::SymmSegmentGeneratorXY<autocheck::RandomCirclePointGenerato rXY<autocheck::generator<double, void> > > >, autocheck::reporter const&, autocheck::classifier<GeoLib::LineSegment, GeoLib::LineSegment>, bool) (check.hpp:39)
by 0xE4D1BA: LineSegmentIntersect2dTest_RandomSegmentOrientationIntersecting_Test::TestBody() (TestLineSegmentIntersect2d.cpp:78)
Your program just tried to execute an instruction that Valgrind did not recognise. There are two possible reasons for this.

Your program has a bug and erroneously jumped to a non-code location. If you are running Memcheck and you just saw a warning about a bad jump, it's probably your program's fault.
The instruction is legitimate but Valgrind doesn't handle it, i.e. it's Valgrind's fault. If you think this is the case or you are not sure, please let us know and we'll try to fix it.
Either way, Valgrind will now raise a SIGILL signal which will
probably kill your program.

norihiro-w · 2016-04-15T17:09:27Z

It seems valgrind failed because the test uses RDRAND instruction (__x86_rdrand()) which is on-chip hardware random number generator (see https://en.wikipedia.org/wiki/RdRand). As this is hardware dependent, valgrind may not suppose it in some hardware. see, e.g., https://bugs.launchpad.net/ubuntu/+source/valgrind/+bug/852795

I'm not sure how we can fix it. you may need to change some code in auto check where it specifies how to generate random numbers, i.e. change it to use some software random number generator. Alternatively, as a temporal solution, you may try valgrind on other computers.

ogsbot · 2016-04-20T09:58:29Z

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1516/

ogsbot · 2016-04-20T10:01:23Z

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1494/

ogsbot · 2016-04-20T10:17:02Z

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1518/

ogsbot · 2016-04-20T10:22:16Z

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1496/

chleh · 2016-04-21T07:13:01Z

Currently I don't feel like I want to contemplate about your changes all by myself. I think this PR is a good candidate for a personal introduction by yourself to the reviewers (less thinking required on my side, and maybe it's faster). Of course, if others volunteered for reviewing without prior presentation, that would be fine, too.

TomFischer · 2016-04-21T08:16:25Z

@chleh The main points of the PR are the changes to class LineSegment and the introduction of the class Polyline::SegmentIterator. All other changes are related to this.

Are you available tomorrow morning for an explanation?

endJunction · 2016-04-21T10:01:07Z

GeoLib/LineSegment.cpp

+	line_segment._point_mem_management_by_line_segment = false;
+}
+
+LineSegment::LineSegment()


This is no longer needed... ✅

ogsbot · 2016-04-21T13:34:50Z

Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1657/

ogsbot · 2016-04-21T13:47:47Z

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1535/

TomFischer · 2016-04-22T08:59:45Z

Commit 2c86725 and d25f04e results of a discussion with @chleh.

first commit documents/explains the default value of the third argument
second commit is simply using modern C++

ogsbot · 2016-04-22T09:06:41Z

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1524/

TomFischer · 2016-04-22T09:43:59Z

Jenkins, test this please.

chleh · 2016-04-23T06:36:56Z

GeoLib/Polygon.h

-									GeoLib::Point* intersection_pnt,
-									std::size_t& seg_num) const;
-
+	bool getNextIntersectionPointPolygonLine(GeoLib::LineSegment const& seg,


Could you please document the meaning of the Boolean return value, too. ✅

ogsbot · 2020-06-19T12:26:40Z

OpenGeoSys development has been moved to GitLab.

See this pull request on GitLab.

TomFischer added the stop review 🛑 label Apr 14, 2016

TomFischer force-pushed the LineSegment branch 2 times, most recently from 72d7a21 to 23293a2 Compare April 14, 2016 10:55

TomFischer force-pushed the LineSegment branch 2 times, most recently from 663848a to 8dc858d Compare April 20, 2016 09:55

TomFischer force-pushed the LineSegment branch from 8dc858d to d70ec1c Compare April 20, 2016 10:44

TomFischer added please review and removed stop review 🛑 labels Apr 20, 2016

endJunction reviewed Apr 21, 2016
View reviewed changes

TomFischer force-pushed the LineSegment branch from 0f7a839 to 00b42fe Compare April 21, 2016 12:50

chleh reviewed Apr 23, 2016
View reviewed changes

TomFischer force-pushed the LineSegment branch from f9baa65 to 923ff22 Compare April 28, 2016 04:15

TomFischer added 24 commits April 28, 2016 14:36

[GL] Cleanup unused code.

ae64689

[GL] LineSegment.

935d494

[T/GL] AutoCheckGenerators: Use LineSegment.

db0c474

[GL] Impl. of Polyline::getNumberOfSegments().

bfaf675

[GL] Impl. of Polyline::getSegment().

30f7904

[GL] Impl. of lineSegmentIntersect() using segments.

8259d06

[GL] Impl. of Polyline::SegmentIterator.

f7df0b0

[T/GL] Test LineSegmentIterator.

9ba5758

[GL] Use SegmentIterator in lineSegmentIntersect.

737bd56

[GL] Use SegmentIterator in computeAndInsertAllIntersectionPoints.

6ba5aed

[GL] Polygon::getAllIntersectionPoints() uses LineSegment.

6a5ceda

[GL] Use SegmentIterator in Polygon::getAllIntersectionPoints().

24dab05

[GL] Use SegmentIterator in Polygon::isPartOfPolylineInPolygon().

9c98288

[GL] Use LineSegment in Polygon::containsSegment().

8f25de6

[T/GL] Use SegmentIterator in TestPolygon.

cc17795

[GL] Use SegmentIterator in Polygon::isPolylineInPolygon().

fe6c934

[GL] Use LineSegment in Polygon::getNextIntersectionPointPolygonLine().

f91ced4

[FileIO] Follow-up because of interface changes.

6e3e56b

[T/GL] Use LineSegment version of lineSegmentIntersect().

f142844

[GL] Del point-version of lineSegmentIntersect().

7777229

[T/GL] Use LineSegment in TestLineSegmentIntersect2d.

3b4ebe7

[T/GL] Disable tests for not up-to-date MSVC++.

02a2fe9

[GL] Docu. for return value.

b23b103

[GL] For better readability.

279eceb

TomFischer force-pushed the LineSegment branch from 923ff22 to 279eceb Compare April 28, 2016 12:36

TomFischer merged commit 11f8953 into ufz:master Apr 28, 2016

TomFischer deleted the LineSegment branch April 28, 2016 12:56

TomFischer removed the please rebase label Apr 28, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[GL] Introducing class LineSegment. #1139

[GL] Introducing class LineSegment. #1139

TomFischer commented Apr 13, 2016

ogsbot commented Apr 14, 2016

ogsbot commented Apr 14, 2016

TomFischer commented Apr 15, 2016

norihiro-w commented Apr 15, 2016 •

edited

ogsbot commented Apr 20, 2016

ogsbot commented Apr 20, 2016

ogsbot commented Apr 20, 2016

ogsbot commented Apr 20, 2016

chleh commented Apr 21, 2016

TomFischer commented Apr 21, 2016

endJunction Apr 21, 2016 •

edited by TomFischer

ogsbot commented Apr 21, 2016

ogsbot commented Apr 21, 2016

TomFischer commented Apr 22, 2016

ogsbot commented Apr 22, 2016

TomFischer commented Apr 22, 2016

chleh Apr 23, 2016 •

edited by TomFischer

ogsbot commented Jun 19, 2020

[GL] Introducing class LineSegment. #1139

[GL] Introducing class LineSegment. #1139

Conversation

TomFischer commented Apr 13, 2016

ogsbot commented Apr 14, 2016

ogsbot commented Apr 14, 2016

TomFischer commented Apr 15, 2016

norihiro-w commented Apr 15, 2016 • edited

ogsbot commented Apr 20, 2016

ogsbot commented Apr 20, 2016

ogsbot commented Apr 20, 2016

ogsbot commented Apr 20, 2016

chleh commented Apr 21, 2016

TomFischer commented Apr 21, 2016

endJunction Apr 21, 2016 • edited by TomFischer

Choose a reason for hiding this comment

ogsbot commented Apr 21, 2016

ogsbot commented Apr 21, 2016

TomFischer commented Apr 22, 2016

ogsbot commented Apr 22, 2016

TomFischer commented Apr 22, 2016

chleh Apr 23, 2016 • edited by TomFischer

Choose a reason for hiding this comment

ogsbot commented Jun 19, 2020

norihiro-w commented Apr 15, 2016 •

edited

endJunction Apr 21, 2016 •

edited by TomFischer

chleh Apr 23, 2016 •

edited by TomFischer