Commit Graph

2365 Commits

Author SHA1 Message Date
Menelaos Karavelas
b8765e195a [set ops] added missing include (fstream) 2014-04-10 08:46:20 +03:00
Menelaos Karavelas
caadd6ce00 [set ops] replace included unit test by unit test 2014-04-10 08:45:38 +03:00
Menelaos Karavelas
3604f45e88 Merge branch 'develop' of https://github.com/boostorg/geometry into feature/setops 2014-04-07 12:27:44 +03:00
Adam Wulkiewicz
df63e9d446 Merge pull request #5 from mkaravel/feature/point_iterator
[point_iterator] fix errors and warnings for g++ and clang++ with C++11 enabled
2014-04-07 11:17:26 +02:00
Menelaos Karavelas
a307bec090 [point iterator][concatenate iterator] replace enable_if mechanism by static assert; add templated assignment operator; make dereference and increment inline;
templatize equal for comparison against other concatenate iterator (needed for interoperability between const/non-const versions);
2014-04-07 11:31:42 +03:00
Menelaos Karavelas
cb3a103256 [point iterator] replace enable_if mechanism by static assert; 2014-04-07 11:30:20 +03:00
Menelaos Karavelas
0316b64019 [point iterator][flatten iterator] replace enable_if mechanism in copy constructor by static asserts;
add static assert to assignment operator; make dereference inline;
2014-04-07 11:27:46 +03:00
Menelaos Karavelas
457d22d0d9 [point iterator] add tests for const/non-const iterator equality/inequality 2014-04-07 11:26:14 +03:00
Menelaos Karavelas
2ea67309e7 [point iterator][concatenate iterator] make the unit test more elaborate: add tests for vector-vector and list-list container conbinations 2014-04-07 11:22:07 +03:00
Menelaos Karavelas
ab5c78cec0 [point iterator] minor stylistic fix 2014-04-07 11:19:45 +03:00
Menelaos Karavelas
082adbb655 [point_iterator] fix errors and warnings for g++ and clang++ with C++11 enabled 2014-04-06 01:43:25 +03:00
Menelaos Karavelas
d08a0b1ad3 [set ops] removing duplicate turns is disabled now; no need for this, after Adam's fix; 2014-04-03 13:12:11 +03:00
Menelaos Karavelas
91d094673b Merge branch 'develop' of https://github.com/boostorg/geometry into feature/setops 2014-04-03 13:05:16 +03:00
Adam Wulkiewicz
ca0c8b97df [get_turns] Fix turns dumplication for L/L.
Change the ignoring check calculation in get_turn_info_for_endpoint.
Add additional parameters to the second version of collinear_opposite<>::apply() defining if the pk and/or qk are valid (in other words current segment is NOT the last one).
Also make ignoring check for last endpoint in L/A more clear.
2014-04-03 11:58:50 +02:00
Menelaos Karavelas
6eed104318 [set ops] removed my name from the copyright header 2014-04-03 08:48:48 +03:00
Menelaos Karavelas
b49a67fd29 [set ops] remove code for removing extra points 2014-04-03 04:02:04 +03:00
Menelaos Karavelas
8f46bb45e8 [set ops] remove debug code; code is called from unit tests 2014-04-03 03:55:04 +03:00
Menelaos Karavelas
dd13023f5f [set ops] remove print-outs inside the file 2014-04-03 03:46:37 +03:00
Menelaos Karavelas
b88b4e3d71 [set ops] re-arranged code a bit; moved tests from algorithms/detail/overlay/linear_linear.hpp to currect branch 2014-04-03 03:43:11 +03:00
Menelaos Karavelas
2d1eaf2ef3 [set ops] better/shorter implementation for follow of L/L geometries; fix bug in previous code (linestrings in multilinestrings that had no turns where not reported in difference) 2014-04-03 02:54:33 +03:00
Menelaos Karavelas
db2079834f [set ops] make some stylistic changes and code re-arrangement 2014-04-03 02:54:14 +03:00
Menelaos Karavelas
27921c5a14 [set ops] remove include of multi-point geometry 2014-04-03 02:51:55 +03:00
Menelaos Karavelas
be2795a6f2 [set ops] add missing include 2014-04-03 02:51:16 +03:00
Menelaos Karavelas
5be2682000 [set ops] rename test_set_ops_common.hpp to test_set_ops_linear_linear.hpp 2014-04-03 02:50:30 +03:00
Menelaos Karavelas
52b0018eaa [set ops] add missing include 2014-04-03 01:04:20 +03:00
Menelaos Karavelas
4295f0bcf7 [set ops] add more examples with duplicate points and zero length linestrings 2014-04-03 00:36:44 +03:00
Menelaos Karavelas
df33e8a92a [set ops] modify way of calling multilinestring_equals (due to changes in multilinestring_equals) 2014-04-03 00:08:11 +03:00
Menelaos Karavelas
a806cd0419 [set ops] change macro used for debugging 2014-04-03 00:04:50 +03:00
Menelaos Karavelas
b0e2521fa1 [set ops] allow equality for multilinestrings with duplicate linestrings 2014-04-03 00:02:13 +03:00
Menelaos Karavelas
4ceea13cf4 Merge branch 'develop' of https://github.com/boostorg/geometry into feature/setops 2014-04-02 21:47:09 +03:00
Adam Wulkiewicz
2f9f454334 [get_turns] fix for MultiLinestrings containing Ls with equal points
In this case no sections were generated for those "empty" Linestrings but if there were some sections already generated they could be marked as last_non_duplicated.
2014-04-02 20:21:32 +02:00
Menelaos Karavelas
598b6a51cf Merge branch 'feature/relate' of https://github.com/boostorg/geometry into feature/setops 2014-04-02 11:09:17 +03:00
Menelaos Karavelas
39a521934d [intersection] guard print-outs within a #ifdef/#endif block 2014-04-02 10:31:43 +03:00
Adam Wulkiewicz
0c6a0d1890 [relate] Add HandleOtherTag to turns::less_seg_dist_op<>, change TurnAnalyser concept.
HandleOtherTag can be used to define how should the seg_id of the other geometry be used in comparison.
TurnAnalyser now must have two versions of apply(). One is called for it != last and the other one for it == last.
2014-04-02 01:38:19 +02:00
Adam Wulkiewicz
8774426417 [relate] rearrange updates of result in interrupt policy for A/A to show the handling pattern 2014-04-01 22:39:23 +02:00
Adam Wulkiewicz
f2fea86f7e [relate] fix special case of L/L and L/A - going out and in on the same point but with different segment.
Linestring going into the exterior of the second geometry and then going inside on the same point. In this case the exterior wasn't taken into account. Now in addition to the Point, seg_id is checked. The check should also be faster since integral segment ids are checked before Points.
exit_watcher methods now take Turn instead of Point, seg_id and other_id.
Also added some tests for non-simple A/A.
2014-04-01 22:20:29 +02:00
Menelaos Karavelas
ffdb1d34f0 Merge branch 'develop' of https://github.com/boostorg/geometry into feature/setops
Conflicts:
	include/boost/geometry/algorithms/detail/relate/less.hpp
2014-04-01 04:05:50 +03:00
Menelaos Karavelas
4101d4368f [intersection] fix expected intersection in two examples in unit test 2014-04-01 03:47:41 +03:00
Adam Wulkiewicz
759258563e Merge branch 'feature/relate' of github.com:boostorg/geometry into feature/relate 2014-04-01 00:12:22 +02:00
Adam Wulkiewicz
0a49cb1e3e [relate] support simple, equal geometries in currently used, simplified interrupt_policy 2014-04-01 00:11:57 +02:00
Adam Wulkiewicz
c27671336c Merge pull request #4 from mkaravel/feature/point_iterator
Merge feature/point_iterator into develop
2014-04-01 00:07:20 +02:00
Menelaos Karavelas
415500955a [point iterator] minor staylistic changes in unit test for concatenate iterator; 2014-03-31 14:52:03 +03:00
Adam Wulkiewicz
2fc1ca4e9c [relate] Fix for_each_disjoint_geometry_if return value for Multi Geometries
Fix GCC warnings.
2014-03-31 09:41:17 +02:00
Menelaos Karavelas
861e094b7c [point_iterator] add separate unit test for flatten iterator; updated Jamfile to run the unit tests for point/concatenate/flatten iterator; 2014-03-31 09:33:23 +03:00
Adam Wulkiewicz
b6bf7038c9 Merge branch 'develop' into feature/relate 2014-03-29 23:46:22 +01:00
Adam Wulkiewicz
fc1a2545a5 [get_turns] Fix test for L/L and L/A - missing functions in expected_pusher range 2014-03-29 14:41:51 +01:00
Adam Wulkiewicz
b0221bcda1 [get_turns] fix invalid equal<> use (convert() for uninitialized Point) in get_turn_info_for_endpoints and get_turn_info_linear_areal 2014-03-29 14:08:11 +01:00
Adam Wulkiewicz
8f7e0a39e4 [relate] fix GCC compile errors - hiding of template parameters and unknown identifier in not used part of the code 2014-03-29 13:36:51 +01:00
Menelaos Karavelas
5da4191c59 [point_iterator][concatenate_iterator] add separate unit test; 2014-03-28 11:57:35 +02:00
Menelaos Karavelas
d5d4b08a0c [point_iterator] minor stylistic changes; 2014-03-28 11:57:05 +02:00