Fix CAlphabet::Clone + unit test #3676
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
karlnapf
approved these changes
Mar 6, 2017
| @@ -0,0 +1,25 @@ | |||
| /* | |||
| * This program is free software; you can redistribute it and/or modify | |||
| * it under the terms of the GNU General Public License as published by | |||
There was a problem hiding this comment.
BSD please, see more recent headers
| CAlphabet * alph_clone = (CAlphabet *) alph->clone(); | ||
|
|
||
| EXPECT_EQ(alph->get_num_symbols(), alph_clone->get_num_symbols()); | ||
| EXPECT_EQ(alph->get_num_symbols_in_histogram(), alph_clone->get_num_symbols_in_histogram()); |
There was a problem hiding this comment.
did you valgrind check this for leaks?
| { | ||
| CAlphabet * alph_clone = (CAlphabet *) CSGObject::clone(); | ||
| alph_clone->init_map_table(); | ||
| alph_clone->copy_histogram(this); |
There was a problem hiding this comment.
is this all that is needed? If so this is a neat solution
There was a problem hiding this comment.
I was hoping you guys could tell! There was that obscure comment in the code here, I can't say for sure the patch is enough. Certainly the code before wasn't all that was needed :P
| @@ -306,6 +306,8 @@ class CAlphabet : public CSGObject | |||
| template <class ST> | |||
| static void translate_from_single_order_reversed(ST* obs, int32_t sequence_length, int32_t start, int32_t p_order, int32_t max_val, int32_t gap); | |||
|
|
|||
| CSGObject * clone(); | |||
There was a problem hiding this comment.
we usually have no space before pointer *
| @@ -832,6 +832,14 @@ void CAlphabet::translate_from_single_order_reversed(ST* obs, int32_t sequence_l | |||
| } | |||
| } | |||
|
|
|||
| CSGObject * CAlphabet::clone() | |||
| { | |||
| CAlphabet * alph_clone = (CAlphabet *) CSGObject::clone(); | |||
|
@vigsterkr feel free to merge |
|
boooyaaaa |
|
Feel free to change the license to BSD and fix the code style issues. Now that this was merged I guess it's easier if you commit directly. |
karasikov
pushed a commit
to karasikov/shogun
that referenced
this pull request
Apr 15, 2017
Fix CAlphabet::Clone + unit test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Seems like
CAlphabetcouldn't be cloned properly. Another bug that surfaced with the all the cloning happening now with parallel xval, for me in the case ofCCommWordStringKernel.There are some remarks about this in the serialization section here.
Please check.