From 0cd974cb7f3f9c98b20b8296e6ce3502f7654275 Mon Sep 17 00:00:00 2001 From: Jiri Vlasak Date: Tue, 26 May 2020 16:06:08 +0200 Subject: [PATCH] Use goal zone in main compound extensions --- README.md | 48 ++++++++++++++++++++++++------------------------ api/rrtce.h | 45 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 65 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 0ce62cc..c6b89a9 100644 --- a/README.md +++ b/README.md @@ -55,9 +55,9 @@ number accomply to file `src/rrtextN.cc` where `N` is: There is a list of classes with reference to extensions used. The extensio number accomply to class `RRTCEn` where `n` is: -1. cute, Dijkstra, RS-H. -2. cute, Dijkstra, RS-E. -3. cute, Dijkstra, RS-RS. +1. cute, gz, Dijkstra, RS-H. +2. cute, gz, Dijkstra, RS-E. +3. cute, gz, Dijkstra, RS-RS. 4. RS-H, cute, 2D grid. 5. cute, 2D grid, RS-E. 6. cute, 2D grid, RS-RS. @@ -71,27 +71,27 @@ number accomply to class `RRTCEn` where `n` is: 14. cute, Dijkstra, 3D tree, RS-H. 15. cute, Dijkstra, 3D grid, RS-RS. 16. cute, Dijkstra, 3D grid, RS-H. -17. cute, Dijkstra, RS-B. - -18. cute, Dijkstra, 2D grid, RS-RS -19. cute, Dijkstra, 2D grid, RS-E -20. cute, Dijkstra, 2D grid, RS-H -21. cute, Dijkstra, 2D grid, RS-B - -22. cute, Dijkstra, 2D tree, RS-RS -23. cute, Dijkstra, 2D tree, RS-E -24. cute, Dijkstra, 2D tree, RS-H -25. cute, Dijkstra, 2D tree, RS-B - -26. cute, Dijkstra, 3D grid, RS-RS -27. cute, Dijkstra, 3D grid, RS-E -28. cute, Dijkstra, 3D grid, RS-H -29. cute, Dijkstra, 3D grid, RS-B - -30. cute, Dijkstra, 3D tree, RS-RS -31. cute, Dijkstra, 3D tree, RS-E -32. cute, Dijkstra, 3D tree, RS-H -33. cute, Dijkstra, 3D tree, RS-B +17. cute, gz, Dijkstra, RS-B. + +18. cute, gz, Dijkstra, 2D grid, RS-RS +19. cute, gz, Dijkstra, 2D grid, RS-E +20. cute, gz, Dijkstra, 2D grid, RS-H +21. cute, gz, Dijkstra, 2D grid, RS-B + +22. cute, gz, Dijkstra, 2D tree, RS-RS +23. cute, gz, Dijkstra, 2D tree, RS-E +24. cute, gz, Dijkstra, 2D tree, RS-H +25. cute, gz, Dijkstra, 2D tree, RS-B + +26. cute, gz, Dijkstra, 3D grid, RS-RS +27. cute, gz, Dijkstra, 3D grid, RS-E +28. cute, gz, Dijkstra, 3D grid, RS-H +29. cute, gz, Dijkstra, 3D grid, RS-B + +30. cute, gz, Dijkstra, 3D tree, RS-RS +31. cute, gz, Dijkstra, 3D tree, RS-E +32. cute, gz, Dijkstra, 3D tree, RS-H +33. cute, gz, Dijkstra, 3D tree, RS-B # Contribute Use [OneFlow][3] branching model and keep the [changelog][4]. diff --git a/api/rrtce.h b/api/rrtce.h index e7ac61e..5579314 100644 --- a/api/rrtce.h +++ b/api/rrtce.h @@ -13,6 +13,7 @@ Compound extensions have no implementation. class RRTCE33 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt8 , public RRTExt10 @@ -31,6 +32,7 @@ class RRTCE33 }; class RRTCE32 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt8 , public RRTExt1 @@ -49,6 +51,7 @@ class RRTCE32 }; class RRTCE31 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt8 , public RRTExt5 @@ -67,6 +70,7 @@ class RRTCE31 }; class RRTCE30 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt8 , public RRTExt6 @@ -86,6 +90,7 @@ class RRTCE30 class RRTCE29 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt9 , public RRTExt10 @@ -104,6 +109,7 @@ class RRTCE29 }; class RRTCE28 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt9 , public RRTExt1 @@ -122,6 +128,7 @@ class RRTCE28 }; class RRTCE27 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt9 , public RRTExt5 @@ -140,6 +147,7 @@ class RRTCE27 }; class RRTCE26 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt9 , public RRTExt6 @@ -159,6 +167,7 @@ class RRTCE26 class RRTCE25 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt7 , public RRTExt10 @@ -177,6 +186,7 @@ class RRTCE25 }; class RRTCE24 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt7 , public RRTExt1 @@ -195,6 +205,7 @@ class RRTCE24 }; class RRTCE23 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt7 , public RRTExt5 @@ -213,6 +224,7 @@ class RRTCE23 }; class RRTCE22 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt7 , public RRTExt6 @@ -232,6 +244,7 @@ class RRTCE22 class RRTCE21 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt4 , public RRTExt10 @@ -250,6 +263,7 @@ class RRTCE21 }; class RRTCE20 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt4 , public RRTExt1 @@ -268,6 +282,7 @@ class RRTCE20 }; class RRTCE19 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt4 , public RRTExt5 @@ -286,6 +301,7 @@ class RRTCE19 }; class RRTCE18 : public RRTExt2 + , public RRTExt11 , public RRTExt3 , public RRTExt4 , public RRTExt6 @@ -303,7 +319,13 @@ class RRTCE18 } }; -class RRTCE17 : public RRTExt2, public RRTExt3, public RRTExt10 {}; +class RRTCE17 + : public RRTExt2 + , public RRTExt11 + , public RRTExt3 + , public RRTExt10 +{}; + class RRTCE16 : public RRTExt2 , public RRTExt3 @@ -523,8 +545,23 @@ class RRTCE4 : public RRTExt1, public RRTExt2, public RRTExt4 { RRTExt4::deinit(); } }; -class RRTCE3 : public RRTExt2, public RRTExt3, public RRTExt6 {}; -class RRTCE2 : public RRTExt2, public RRTExt3, public RRTExt5 {}; -class RRTCE1 : public RRTExt2, public RRTExt3, public RRTExt1 {}; +class RRTCE3 + : public RRTExt2 + , public RRTExt11 + , public RRTExt3 + , public RRTExt6 +{}; +class RRTCE2 + : public RRTExt2 + , public RRTExt11 + , public RRTExt3 + , public RRTExt5 +{}; +class RRTCE1 + : public RRTExt2 + , public RRTExt11 + , public RRTExt3 + , public RRTExt1 +{}; #endif /* RRTCE_H */ -- 2.39.2