update C++ codebase for handling of feature dependencies [vcs: #minor] #334
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,3 +21,4 @@ bin | |
| *.ipynb_checkpoints | ||
| lib | ||
| fllog.txt | ||
| .DS_STORE | ||
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,40 +18,31 @@ | |
|
|
||
| #include "DependencyTree.h" | ||
|
|
||
| #include <algorithm> //remove | ||
| #include <cctype> //isspace | ||
| #include <fstream> | ||
|
|
||
| static void removeAllWhiteSpace(string &str) { | ||
| str.erase(std::remove_if(str.begin(), str.end(), isspace), str.end()); | ||
| } | ||
|
|
||
| cTree::cTree(const char *strFileName) { | ||
| std::ifstream input(strFileName); | ||
|
|
||
| if (!input) { | ||
| ErrorStr += "\nCould not open the file " + string(strFileName); | ||
| return; | ||
| } | ||
|
|
||
| for (string line; std::getline(input, line);) { | ||
|
There was a problem hiding this comment. wow, so this allows us to skip all the There was a problem hiding this comment. The difference is due to the range based for loop vs while loop. While loop requires those conditions to figure out how long to run. The use of range based for loop is the same in the docs. // read file line by line
std::istringstream input;
input.str("1\n2\n3\n4\n5\n6\n7\n");
int sum = 0;
for (std::string line; std::getline(input, line);)
sum += std::stoi(line);
std::cout << "\nThe sum is " << sum << ".\n\n";
https://en.cppreference.com/w/cpp/string/basic_string/getline There was a problem hiding this comment. great, thanks for the explanation |
||
| removeAllWhiteSpace(line); | ||
| if (!line.empty()) { | ||
| strDependencyFile.push_back(std::move(line)); | ||
| } | ||
| } | ||
|
|
||
| getAllParents(vecFeature); | ||
| } | ||
|
|
||
| /** | ||
| * | ||
|
|
@@ -61,33 +52,31 @@ int cTree::getDependencyList(string) { | |
| * FptrTable : | ||
| * FptrLookup | vector of pairs: | ||
| * first | string: feature name | ||
| * second | vector of feature_function to represent list of | ||
| * dependent features | ||
| * | ||
| */ | ||
| int cTree::setFeaturePointers( | ||
| map<string, feature2function *> &mapFptrLib, feature2function *FptrTable, | ||
| map<string, vector<feature_function> > *FptrLookup) { | ||
| list<string>::iterator lstItr; | ||
| map<string, feature2function *>::iterator mapLibItr; | ||
| feature2function *fptrTbl; | ||
| feature2function::iterator mapFeatureItr; | ||
|
|
||
| string strLibFeature, strLib, strFeature; | ||
|
|
||
| vector<feature_function> vecfptr; | ||
|
There was a problem hiding this comment. sorry, noob question here. I don't see this feature_function type defined anywhere. Is that normal? There was a problem hiding this comment. It was created in typedef int (*feature_function)(mapStr2intVec &,
mapStr2doubleVec &,
mapStr2Str &);There was a problem hiding this comment.
|
||
|
|
||
| if (vecFeature.size() == 0) return -1; | ||
|
|
||
| // vecFeature is a list with all the feature names in the first column | ||
| // of the dependency file | ||
| for (unsigned i = 0; i < vecFeature.size(); i++) { | ||
| FinalList.clear(); | ||
| strLibFeature = vecFeature[i]; | ||
| // fill FinalList with all the dependencies of feature vecFeature[i] | ||
| getDependency(strLibFeature); | ||
| vecfptr.clear(); | ||
| for (lstItr = FinalList.begin(); lstItr != FinalList.end(); lstItr++) { | ||
| // Here strLibFeature is the feature name of the dependent feature | ||
|
|
@@ -102,14 +91,7 @@ int cTree::setFeaturePointers(map<string, feature2function *> &mapFptrLib, | |
| strLib = strLibFeature.substr(0, nPos); | ||
|
|
||
| // Put feature name in strFeature | ||
| strFeature = strLibFeature.substr(nPos + 1); | ||
|
|
||
| // Find the feature function pointer map for the library | ||
| mapLibItr = mapFptrLib.find(strLib); | ||
|
|
@@ -127,15 +109,13 @@ int cTree::setFeaturePointers(map<string, feature2function *> &mapFptrLib, | |
| return -1; | ||
| } | ||
|
|
||
| vecfptr.push_back(mapFeatureItr->second); | ||
| FptrTable->insert(std::pair<string, feature_function>( | ||
| strFeature, mapFeatureItr->second)); | ||
| } | ||
| // Add the vecfptr from above to a map with as key the base featurei | ||
| FptrLookup->insert( | ||
| std::pair<string, vector<feature_function> >(strFeature, vecfptr)); | ||
| } | ||
|
|
||
| return 1; | ||
|
|
@@ -149,7 +129,7 @@ int cTree::setFeaturePointers(map<string, feature2function *> &mapFptrLib, | |
| */ | ||
| int cTree::getAllParents(vector<string> &lstFeature) { | ||
| for (unsigned i = 0; i < strDependencyFile.size(); i++) { | ||
| const string &strLine = strDependencyFile[i]; | ||
| size_t nPos = strLine.find_first_of('#'); | ||
| string FeatureName = strLine.substr(0, nPos); | ||
| if (!FeatureName.empty()) { | ||
|
|
@@ -180,43 +160,21 @@ int cTree::getChilds(string str, list<string> &childs) { | |
| return 1; | ||
| } | ||
|
|
||
| int cTree::getDependency(const string &strLine) { | ||
| std::list<string> tmpChild; | ||
|
|
||
| getChilds(strLine, tmpChild); | ||
| for (const auto &childFeature : tmpChild) { | ||
| getDependency( | ||
| childFeature); // Recursively get dependencies of the child feature. | ||
| } | ||
| AddUniqueItem(strLine); // Add the feature itself to the FinalList. | ||
| return 0; | ||
| } | ||
|
|
||
| void cTree::AddUniqueItem(const string &strFeature) { | ||
| auto it = std::find(FinalList.begin(), FinalList.end(), strFeature); | ||
| if (it == FinalList.end()) { | ||
| FinalList.push_back(strFeature); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be nice to keep this feature. Some users have used it before:
#137
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is reimplemented as a Python function.