Commit Graph

1386 Commits

Author SHA1 Message Date
Adam Wulkiewicz
edf8a613ff [doc][crosses][overlaps] add crosses() to make_qbk.py script, add parameters info to crosses() and overlaps() 2014-04-09 03:26:07 +02:00
Adam Wulkiewicz
0374154930 [relate] fix GCC compilation error caused by a missing #include 2014-04-09 01:52:41 +02:00
Adam Wulkiewicz
2753f5e30a [crosses] add missing files required by bg::crosses() algorithm 2014-04-09 01:34:34 +02:00
Adam Wulkiewicz
d3f8ea2f6b [crosses] add bg::crosses() algorithm 2014-04-09 01:33:37 +02:00
Adam Wulkiewicz
c1d4a09ec7 [overlaps] add support for P/P, L/L and A/A to overlaps() 2014-04-09 00:23:26 +02:00
Adam Wulkiewicz
9e00853dfa [relate] fix: add missing handling of single geometries for which no IPs were generated (exterior ring inside, hole outside) 2014-04-08 15:33:18 +02:00
Adam Wulkiewicz
1c7fa89626 [relate] Fix warnings (unused variables) 2014-04-08 00:16:21 +02:00
Adam Wulkiewicz
d76c94d643 [relate] add optimization for L/L ommitting parts of the algorithm if the result mustnot be updated 2014-04-07 23:52:40 +02:00
Adam Wulkiewicz
cce6c71782 [relate] Add optimizations for L/A disabling parts of the code if the result mustnot be updated 2014-04-07 21:20:20 +02:00
Adam Wulkiewicz
eca27bc8af Merge branch 'develop' into feature/relate 2014-04-07 14:31:16 +02:00
Adam Wulkiewicz
e7e0083428 [relate] Add optimization to A/A skipping parts of the algorithm if it's not possible to change the final result.
Add may_update() funcionality which may be used if it's possible to change the result for the specified matrix fields and overlap dimension.
Initialize flags in no_turns_aa_pred and uncertain_rings_analyser with values calculated using this functionality.
Add manual checks around the parts of areal_areal::apply() where IPs are sorted and analysed.
2014-04-07 14:18:34 +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
Adam Wulkiewicz
8c2ee6152a [relate] Fix wrong type in interrupt_policy for A/A.
Add tests for MLs/MLs, Ring/Poly, Ring/Ring.
2014-04-07 01:30:05 +02:00
Adam Wulkiewicz
7bde891d7a [relate] Add the support for IPs generated for "real" and "fake" holes.
Rename turns::less_seg_dist_op<> to relate::turns::less<>
It now takes the Comp defining how operations are sorted if segment and distance are equal.
Add 2 different operations comparators for L/L,L/A and A/A.
Add tests.
2014-04-07 01:08:24 +02:00
Adam Wulkiewicz
09ab2351f9 [relate] Add support for rings with no turns and some special cases in A/A.
Add support for:
- single geometries for which no turns were generated
- rings for which no turns were generated
- i/i and u/u turns

TODO: some cases where turns are generated for the intersection of a "real" hole and a "fake" hole (self-touching exterior ring).
2014-04-06 02:52:24 +02: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
Adam Wulkiewicz
47747938a6 [relate] add for now commented out ignoring of u/u turns in A/A, add some tests 2014-04-04 01:16:27 +02:00
Adam Wulkiewicz
8cb6366bb4 Merge branch 'develop' into feature/relate 2014-04-03 12:11:22 +02: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
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
Adam Wulkiewicz
47da24242c [relate] add code ignoring i/i turns, comment out some unneeded code in areal_areal 2014-04-02 20:14:34 +02:00
Adam Wulkiewicz
8c700e9f31 [relate] handle non-simple Polygons in A/A, NOT FULLY SUPPORTED
Not supported: i/i, non-intersecting rings
2014-04-02 14:10:36 +02: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
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
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
Adam Wulkiewicz
b6bf7038c9 Merge branch 'develop' into feature/relate 2014-03-29 23:46:22 +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
e1f39cd065 [point_iterator] minor and stylistic changes; in concatenate_iterator use enable_if_c instead of enable_if (shorter code); 2014-03-28 00:30:50 +02:00
Menelaos Karavelas
5e96c27c84 [point_iterator] make private the constructor of point_iterator that takes the base class as argument; 2014-03-28 00:11:16 +02:00
Menelaos Karavelas
c127c56871 [point_iterator] changes due to new location of files and namespaces used; 2014-03-27 23:32:05 +02:00
Menelaos Karavelas
25e746cd2a [point_iterator] move code to new namespace; remove comments; points_begin/point_end now return point_iterator<Geometry> class (suggested by Adam); 2014-03-27 23:29:37 +02:00
Menelaos Karavelas
88264401a1 [point_iterator] change namespace from core_dispatch to dispatch; fix macros of files due to new location; 2014-03-27 23:28:07 +02:00
Menelaos Karavelas
5d27f4f301 [point_iterator][flatten_iterator] polish code a bit; fix problems with copy constructor; 2014-03-27 23:27:23 +02:00
Menelaos Karavelas
f5d48b3798 [point_iterator][concatenate_iterator] fix issues in copy constructor; 2014-03-27 23:26:25 +02:00
Menelaos Karavelas
8a8132e6c0 [point_iterator] moved files to proper directories 2014-03-27 23:23:51 +02:00
Adam Wulkiewicz
438494e045 [relate] add result interrupt check to no_turns_xxx predicates 2014-03-27 16:50:15 +01:00
Adam Wulkiewicz
7df83d69a7 [relate] add support for no-IP casesin A/A, fix for_each_disjoint_geometry_if for Multi Geometries.
Fix a bug in for_each_disjoint_geometry_if resulting in assert failure if no turns are generated. This affects L/L, L/A and A/A.
Enable all combinations of Areal geometries.
Add ignoring of empty disjoint geometries in L/A and A/A.
Add tests for disjoint geometries.
2014-03-27 16:35:43 +01:00
Menelaos Karavelas
64c11353be [point_iterator] move flatten and concatenate iterator implementation in iterators/ directory; 2014-03-27 02:25:38 +02:00
Menelaos Karavelas
555947d8e2 [point_iterator] define points_{begin,end} as inline free functions; 2014-03-27 02:11:02 +02:00
Adam Wulkiewicz
d4418204ec [relate] add support for non-simple non-equal Polygons in A/A.
Currently simple interrupt policy is used.
This approach works is there are IPs, Polygons are simple and not equal.
2014-03-27 00:30:43 +01:00
Adam Wulkiewicz
77c7317cb1 [relate][get_turns] move single_geometry to bg::detail, fix get_turn_info test
also create a preliminary version of relate::areal_areal (copied from linear_areal)
in get_turn_info test mutable begin() and end() because it seems that Range can't handle immutable Ranges
2014-03-26 18:37:31 +01:00
Menelaos Karavelas
7abe47876b [feature/point iterator] implementation of point iterator for most geometries (not yet for point, segment & box); 2014-03-26 10:22:31 +02:00
Adam Wulkiewicz
830a073c0d Merge branch 'feature/relate' into develop 2014-03-25 15:10:48 +01:00