Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upCleanup non-const methods in dense and combined features #4365
Conversation
vinx13
added some commits
Jul 9, 2018
This comment has been minimized.
This comment has been minimized.
|
lgtm! |
| m_is_trained=true; | ||
| distance->init(m_centroids,distance->get_rhs()); | ||
| distance->init(centroids_feats, distance->get_rhs()); |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
vinx13
Jul 9, 2018
Contributor
since we would like to drop setters in featuresset_num_vectors, set_num_features, we can't an empty features and then set feature matrix later, and here there is no need to store it in a member field
| @@ -76,7 +76,7 @@ class CCombinedFeatures : public CFeatures | ||
| } | ||
| /** list feature objects */ | ||
| void list_feature_objs(); | ||
| void list_feature_objs() const; |
This comment has been minimized.
This comment has been minimized.
karlnapf
Jul 9, 2018
Member
lol, this method should rather be deleted (or return a list of strings or so)
| @@ -170,28 +170,6 @@ template<class ST> ST* CDenseFeatures<ST>::get_feature_vector(int32_t num, int32 | ||
| return feat; | ||
| } | ||
| template<class ST> void CDenseFeatures<ST>::set_feature_vector(SGVector<ST> vector, int32_t num) |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
vinx13
Jul 9, 2018
Contributor
yes, and i think set_feature_matrix should be also removed (after some refactor)
This comment has been minimized.
This comment has been minimized.
karlnapf
Jul 9, 2018
Member
absolutely, the instance should be tied to the matrix, and otherwise users can create a new instance
| @@ -331,16 +309,6 @@ void CDenseFeatures<ST>::copy_feature_matrix(SGMatrix<ST> target, index_t column | ||
| } | ||
| } | ||
| template<class ST> SGMatrix<ST> CDenseFeatures<ST>::steal_feature_matrix() |
This comment has been minimized.
This comment has been minimized.
| @@ -468,21 +438,6 @@ template<class ST> void CDenseFeatures<ST>::initialize_cache() | ||
| template<class ST> EFeatureClass CDenseFeatures<ST>::get_feature_class() const { return C_DENSE; } | ||
| template<class ST> bool CDenseFeatures<ST>::reshape(int32_t p_num_features, int32_t p_num_vectors) |
This comment has been minimized.
This comment has been minimized.
karlnapf
Jul 9, 2018
Member
this should just be in the matrix itself, i.e. create a new feature instance using the reshaped sgmatrix
| @@ -259,7 +259,7 @@ class CFeatures : public CSGObject | ||
| * @return new feature object which contains copy of data of this | ||
| * instance and of given one | ||
| */ | ||
| virtual CFeatures* create_merged_copy(CFeatures* other) | ||
| virtual CFeatures* create_merged_copy(CFeatures* other) const |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
CI is not happy though |
This comment has been minimized.
This comment has been minimized.
|
let me know once CI is happy and I will merge |
This comment has been minimized.
This comment has been minimized.
|
@karlnapf timeout on windows |
This comment has been minimized.
This comment has been minimized.
|
restarted. |
vinx13 commentedJul 9, 2018
create_merged_copy,get_feature_matrix,get_feature_objset_feature_vector,reshape,steal_feature_matrixfree_featuresprotected