|
56 | 56 | <let name="euclidean_cluster/input/pointcloud" value="$(var segmentation_based_filtered/output/pointcloud)" if="$(var use_image_segmentation_based_filter)"/>
|
57 | 57 | <let name="euclidean_cluster/input/pointcloud" value="$(var input/pointcloud_map/pointcloud)" unless="$(var use_image_segmentation_based_filter)"/>
|
58 | 58 | <let name="clustering/clusters" value="$(var ns)/clustering/clusters"/>
|
59 |
| - <let name="euclidean_cluster/output/clusters" value="$(var ns)/clustering/euclidean_cluster/clusters" if="$(var use_roi_based_cluster)"/> |
60 |
| - <let name="euclidean_cluster/output/clusters" value="$(var clustering/clusters)" unless="$(var use_roi_based_cluster)"/> |
61 |
| - <let name="roi_cluster/input/pointcloud" value="$(var input/pointcloud_map/pointcloud)"/> |
62 |
| - <let name="roi_cluster/output/clusters" value="$(var ns)/clustering/roi_cluster/clusters"/> |
63 |
| - <let name="roi_merged_cluster/output/clusters" value="$(var clustering/clusters)"/> |
| 59 | + <!-- <let name="euclidean_cluster/output/clusters" value="$(var ns)/clustering/euclidean_cluster/clusters" if="$(var use_roi_based_cluster)"/> --> |
| 60 | + <let name="euclidean_cluster/output/clusters" value="$(var clustering/clusters)"/> |
64 | 61 | <let name="shape_estimation1/input/clusters" value="$(var clustering/clusters)"/>
|
65 | 62 | <let name="shape_estimation1/output/objects" value="$(var output/clustering/cluster_objects)"/>
|
66 | 63 |
|
67 |
| - <let name="roi_cluster_fusion/input/clusters" value="$(var ns)/clustering/clusters"/> |
| 64 | + <let name="roi_cluster_fusion/input/clusters" value="$(var euclidean_cluster/output/clusters)"/> |
68 | 65 | <let name="roi_cluster_fusion/output/clusters" value="$(var ns)/clustering/camera_lidar_fusion/clusters"/>
|
69 | 66 | <let name="low_intensity_cluster_filter/input/clusters" value="$(var roi_cluster_fusion/output/clusters)"/>
|
70 | 67 | <let name="low_intensity_cluster_filter/output/clusters" value="$(var ns)/clustering/camera_lidar_fusion/filtered/clusters"/>
|
71 |
| - <let name="shape_estimation2/input/clusters" value="$(var low_intensity_cluster_filter/output/clusters)" if="$(var use_low_intensity_cluster_filter)"/> |
72 |
| - <let name="shape_estimation2/input/clusters" value="$(var roi_cluster_fusion/output/clusters)" unless="$(var use_low_intensity_cluster_filter)"/> |
| 68 | + |
| 69 | + <let name="roi_cluster/input/pointcloud" value="$(var input/pointcloud_map/pointcloud)"/> |
| 70 | + <let name="roi_cluster/output/clusters" value="$(var ns)/clustering/roi_cluster/clusters"/> |
| 71 | + <let name="roi_cluster_merger/input/clusters0" value="$(var low_intensity_cluster_filter/output/clusters)" if="$(var use_low_intensity_cluster_filter)"/> |
| 72 | + <let name="roi_cluster_merger/input/clusters0" value="$(var roi_cluster_fusion/output/clusters)" unless="$(var use_low_intensity_cluster_filter)"/> |
| 73 | + <let name="roi_cluster_merger/output/clusters" value="$(var ns)/clustering/camera_lidar_fusion/merger/clusters"/> |
| 74 | + |
| 75 | + <let name="shape_estimation2/input/clusters" value="$(var roi_cluster_merger/output/clusters)" if="$(eval "'$(var use_roi_based_cluster)' == 'true'")"/> |
| 76 | + <let |
| 77 | + name="shape_estimation2/input/clusters" |
| 78 | + value="$(var low_intensity_cluster_filter/output/clusters)" |
| 79 | + if="$(eval "'$(var use_roi_based_cluster)' == 'false' and '$(var use_low_intensity_cluster_filter)' == 'true'")" |
| 80 | + /> |
| 81 | + <let |
| 82 | + name="shape_estimation2/input/clusters" |
| 83 | + value="$(var roi_cluster_fusion/output/clusters)" |
| 84 | + if="$(eval "'$(var use_roi_based_cluster)' == 'false' and '$(var use_low_intensity_cluster_filter)' == 'false'")" |
| 85 | + /> |
73 | 86 | <let name="shape_estimation2/output/objects" value="$(var ns)/clustering/camera_lidar_fusion/objects_with_feature"/>
|
74 | 87 | <let name="detected_object_feature_remover/input/objects_with_feature" value="$(var shape_estimation2/output/objects)"/>
|
75 | 88 | <let name="detected_object_feature_remover/output/objects" value="$(var output/rule_detector/objects)"/>
|
|
187 | 200 | </group>
|
188 | 201 | </group>
|
189 | 202 |
|
190 |
| - <!-- simple_cluster_merger --> |
191 |
| - <group> |
192 |
| - <include file="$(find-pkg-share autoware_cluster_merger)/launch/cluster_merger.launch.xml" if="$(var use_roi_based_cluster)"> |
193 |
| - <arg name="input/cluster0" value="$(var euclidean_cluster/output/clusters)"/> |
194 |
| - <arg name="input/cluster1" value="$(var roi_cluster/output/clusters)"/> |
195 |
| - <arg name="output/clusters" value="$(var roi_merged_cluster/output/clusters)"/> |
196 |
| - </include> |
197 |
| - </group> |
198 |
| - |
199 | 203 | <!-- shape_estimation 1 -->
|
200 | 204 | <group>
|
201 | 205 | <include file="$(find-pkg-share autoware_shape_estimation)/launch/shape_estimation.launch.xml">
|
|
250 | 254 | </include>
|
251 | 255 | </group>
|
252 | 256 |
|
| 257 | + <!-- simple_cluster_merger --> |
| 258 | + <group> |
| 259 | + <include file="$(find-pkg-share autoware_cluster_merger)/launch/cluster_merger.launch.xml" if="$(var use_roi_based_cluster)"> |
| 260 | + <arg name="input/cluster0" value="$(var roi_cluster_merger/input/clusters0)"/> |
| 261 | + <arg name="input/cluster1" value="$(var roi_cluster/output/clusters)"/> |
| 262 | + <arg name="output/clusters" value="$(var roi_cluster_merger/output/clusters)"/> |
| 263 | + </include> |
| 264 | + </group> |
| 265 | + |
253 | 266 | <group>
|
254 | 267 | <include file="$(find-pkg-share autoware_shape_estimation)/launch/shape_estimation.launch.xml">
|
255 | 268 | <arg name="input/objects" value="$(var shape_estimation2/input/clusters)"/>
|
|
0 commit comments