Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use nullptr in module ml #3015

Merged
merged 1 commit into from
Apr 22, 2019
Merged

Use nullptr in module ml #3015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ml/include/pcl/ml/impl/dt/decision_tree_trainer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ pcl::DecisionTreeTrainer<FeatureType, DataSet, LabelType, ExampleIndex, NodeType
: max_tree_depth_ (15)
, num_of_features_ (1000)
, num_of_thresholds_ (10)
, feature_handler_ (NULL)
, stats_estimator_ (NULL)
, feature_handler_ (nullptr)
, stats_estimator_ (nullptr)
, data_set_ ()
, label_data_ ()
, examples_ ()
Expand Down
12 changes: 6 additions & 6 deletions ml/include/pcl/ml/svm_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ namespace pcl
probability = 0; // do probability estimates

nr_weight = 0; // for C_SVC
weight_label = NULL; // for C_SVC
weight = NULL; // for C_SVC
weight_label = nullptr; // for C_SVC
weight = nullptr; // for C_SVC
}
};

Expand All @@ -91,8 +91,8 @@ namespace pcl
SVMModel ()
{
l = 0;
probA = NULL;
probB = NULL;
probA = nullptr;
probB = nullptr;
}
};

Expand Down Expand Up @@ -177,7 +177,7 @@ namespace pcl
/** \brief Constructor. */
SVM () :
training_set_ (), prob_ (), model_ (), scaling_ (), param_ (),
class_name_ (), line_ (NULL), max_line_len_ (10000), labelled_training_set_ (true)
class_name_ (), line_ (nullptr), max_line_len_ (10000), labelled_training_set_ (true)
{
}

Expand Down Expand Up @@ -333,7 +333,7 @@ namespace pcl
debug_ = in;

if (in)
svm_set_print_string_function (NULL);
svm_set_print_string_function (nullptr);
else
svm_set_print_string_function (&printNull);
};
Expand Down
2 changes: 1 addition & 1 deletion ml/src/permutohedral.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
///////////////////////////////////////////////////////////////////////////////////////////
pcl::Permutohedral::Permutohedral () :
N_ (0), M_ (0), d_ (0),
blur_neighborsOLD_(NULL), offsetOLD_ (NULL), barycentricOLD_ (NULL)
blur_neighborsOLD_(nullptr), offsetOLD_ (nullptr), barycentricOLD_ (nullptr)
{}

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
Loading