Skip to content

Commit c4913d6

Browse files
committed
remove unnecessary 0.5 factor
1 parent dae3112 commit c4913d6

9 files changed

+14
-14
lines changed

include/gtsam_points/cuda/kernels/vgicp_derivatives.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ struct vgicp_derivatives_kernel {
6161
Eigen::Matrix<float, 6, 3> J_source_RCR_inv = J_source.transpose() * RCR_inv;
6262

6363
LinearizedSystem6 linearized;
64-
linearized.error = 0.5f * error.transpose() * RCR_inv * error;
64+
linearized.error = error.transpose() * RCR_inv * error;
6565
linearized.H_target = J_target_RCR_inv * J_target;
6666
linearized.H_source = J_source_RCR_inv * J_source;
6767
linearized.H_target_source = J_target_RCR_inv * J_source;
@@ -123,7 +123,7 @@ struct vgicp_error_kernel {
123123
const Eigen::Matrix3f RCR_inv = (cov_B + RCR).inverse();
124124
Eigen::Vector3f error = mean_B - transed_mean_A;
125125

126-
return 0.5f * error.transpose() * RCR_inv * error;
126+
return error.transpose() * RCR_inv * error;
127127
}
128128

129129
const Eigen::Isometry3f* linearization_point_ptr;

include/gtsam_points/factors/impl/integrated_color_consistency_factor_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ double IntegratedColorConsistencyFactor_<TargetFrame, SourceFrame, IntensityGrad
169169
const Eigen::Vector4d offset = projected - mean_B;
170170
const double error_photo = intensity_B + gradient_B.dot(offset) - intensity_A;
171171

172-
const double err = 0.5 * error_photo * photometric_term_weight * error_photo;
172+
const double err = error_photo * photometric_term_weight * error_photo;
173173

174174
if (!H_target) {
175175
return err;

include/gtsam_points/factors/impl/integrated_colored_gicp_factor_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,14 @@ double IntegratedColoredGICPFactor_<TargetFrame, SourceFrame, IntensityGradients
182182

183183
// geometric error
184184
const Eigen::Vector4d residual_geom = transed_A - mean_B;
185-
const double error_geom = 0.5 * residual_geom.transpose() * geometric_term_weight * mahalanobis[i] * residual_geom;
185+
const double error_geom = residual_geom.transpose() * geometric_term_weight * mahalanobis[i] * residual_geom;
186186

187187
// photometric error
188188
const Eigen::Vector4d projected = transed_A - (transed_A - mean_B).dot(normal_B) * normal_B;
189189
const Eigen::Vector4d offset = projected - mean_B;
190190
const double residual_photo = intensity_B + gradient_B.dot(offset) - intensity_A;
191191

192-
const double error_photo = 0.5 * residual_photo * photometric_term_weight * residual_photo;
192+
const double error_photo = residual_photo * photometric_term_weight * residual_photo;
193193

194194
if (!H_target) {
195195
return error_geom + error_photo;

include/gtsam_points/factors/impl/integrated_ct_gicp_factor_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ double IntegratedCT_GICPFactor_<TargetFrame, SourceFrame>::error(const gtsam::Va
7373

7474
const Eigen::Vector4d transed_source_pt = pose * source_pt;
7575
const Eigen::Vector4d residual = transed_source_pt - target_pt;
76-
const double error = 0.5 * residual.transpose() * mahalanobis[i] * residual;
76+
const double error = residual.transpose() * mahalanobis[i] * residual;
7777

7878
return error;
7979
};
@@ -126,7 +126,7 @@ boost::shared_ptr<gtsam::GaussianFactor> IntegratedCT_GICPFactor_<TargetFrame, S
126126
const gtsam::Matrix64 H_0_mahalanobis = H_0.transpose() * mahalanobis[i];
127127
const gtsam::Matrix64 H_1_mahalanobis = H_1.transpose() * mahalanobis[i];
128128

129-
const double error = 0.5 * residual.transpose() * mahalanobis_residual;
129+
const double error = residual.transpose() * mahalanobis_residual;
130130
*H_00 += H_0_mahalanobis * H_0;
131131
*H_11 += H_1_mahalanobis * H_1;
132132
*H_01 += H_0_mahalanobis * H_1;

include/gtsam_points/factors/impl/integrated_ct_icp_factor_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ double IntegratedCT_ICPFactor_<TargetFrame, SourceFrame>::error(const gtsam::Val
102102
gtsam::Point3 residual = transed_source_pt - target_pt.template head<3>();
103103
double error = gtsam::dot(residual, target_normal.template head<3>());
104104

105-
return 0.5 * error * error;
105+
return error * error;
106106
};
107107

108108
if (is_omp_default() || num_threads == 1) {
@@ -162,7 +162,7 @@ boost::shared_ptr<gtsam::GaussianFactor> IntegratedCT_ICPFactor_<TargetFrame, So
162162
*b_0 += H_0.transpose() * error;
163163
*b_1 += H_1.transpose() * error;
164164

165-
return 0.5 * error * error;
165+
return error * error;
166166
};
167167

168168
double error = 0.0;

include/gtsam_points/factors/impl/integrated_gicp_factor_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ double IntegratedGICPFactor_<TargetFrame, SourceFrame>::evaluate(
193193
const Eigen::Vector4d transed_mean_A = delta * mean_A;
194194
const Eigen::Vector4d residual = mean_B - transed_mean_A;
195195

196-
const double error = 0.5 * residual.transpose() * mahalanobis[i] * residual;
196+
const double error = residual.transpose() * mahalanobis[i] * residual;
197197
if (H_target == nullptr) {
198198
return error;
199199
}

include/gtsam_points/factors/impl/integrated_icp_factor_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ double IntegratedICPFactor_<TargetFrame, SourceFrame>::evaluate(
194194
residual = normal_B.array() * residual.array();
195195
}
196196

197-
const double error = 0.5 * residual.transpose() * residual;
197+
const double error = residual.transpose() * residual;
198198
if (H_target == nullptr) {
199199
return error;
200200
}

include/gtsam_points/factors/impl/integrated_loam_factor_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ double IntegratedPointToPlaneFactor_<TargetFrame, SourceFrame>::evaluate(
142142

143143
Eigen::Vector4d residual = x_j - transed_x_i;
144144
Eigen::Vector4d plane_residual = residual.array() * normal.array();
145-
const double error = 0.5 * plane_residual.transpose() * plane_residual;
145+
const double error = plane_residual.transpose() * plane_residual;
146146

147147
if (H_target == nullptr) {
148148
return error;
@@ -297,7 +297,7 @@ double IntegratedPointToEdgeFactor_<TargetFrame, SourceFrame>::evaluate(
297297

298298
Eigen::Vector4d residual = Eigen::Vector4d::Zero();
299299
residual.head<3>() = x_ij.head<3>().cross(x_il.head<3>()) * c_inv;
300-
const double error = 0.5 * residual.dot(residual);
300+
const double error = residual.dot(residual);
301301

302302
if (H_target == nullptr) {
303303
return error;

include/gtsam_points/factors/impl/integrated_vgicp_factor_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ double IntegratedVGICPFactor_<SourceFrame>::evaluate(
153153
Eigen::Vector4d transed_mean_A = delta * mean_A;
154154
Eigen::Vector4d residual = mean_B - transed_mean_A;
155155

156-
const double error = 0.5 * residual.transpose() * mahalanobis[i] * residual;
156+
const double error = residual.transpose() * mahalanobis[i] * residual;
157157

158158
if (!H_target) {
159159
return error;

0 commit comments

Comments
 (0)