Implement hyperparameters with json file
This commit is contained in:
@@ -5,7 +5,7 @@ namespace pywrap {
|
||||
{
|
||||
return callMethodString("graph");
|
||||
}
|
||||
void ODTE::setHyperparameters(nlohmann::json& hyperparameters)
|
||||
void ODTE::setHyperparameters(const nlohmann::json& hyperparameters)
|
||||
{
|
||||
// Check if hyperparameters are valid
|
||||
const std::vector<std::string> validKeys = { "n_jobs", "n_estimators", "random_state" };
|
||||
|
@@ -9,7 +9,7 @@ namespace pywrap {
|
||||
ODTE() : PyClassifier("odte", "Odte") {};
|
||||
~ODTE() = default;
|
||||
std::string graph();
|
||||
void setHyperparameters(nlohmann::json& hyperparameters) override;
|
||||
void setHyperparameters(const nlohmann::json& hyperparameters) override;
|
||||
};
|
||||
} /* namespace pywrap */
|
||||
#endif /* ODTE_H */
|
@@ -81,7 +81,7 @@ namespace pywrap {
|
||||
float result = pyWrap->score(id, Xp, yp);
|
||||
return result;
|
||||
}
|
||||
void PyClassifier::setHyperparameters(nlohmann::json& hyperparameters)
|
||||
void PyClassifier::setHyperparameters(const nlohmann::json& hyperparameters)
|
||||
{
|
||||
// Check if hyperparameters are valid, default is no hyperparameters
|
||||
const std::vector<std::string> validKeys = { };
|
||||
|
@@ -27,7 +27,6 @@ namespace pywrap {
|
||||
std::vector<int> predict(std::vector<std::vector<int >>& X) override { return std::vector<int>(); };
|
||||
float score(std::vector<std::vector<int>>& X, std::vector<int>& y) override { return 0.0; };
|
||||
float score(torch::Tensor& X, torch::Tensor& y) override;
|
||||
void setHyperparameters(nlohmann::json& hyperparameters) override;
|
||||
std::string version();
|
||||
std::string callMethodString(const std::string& method);
|
||||
std::string getVersion() override { return this->version(); };
|
||||
@@ -39,6 +38,7 @@ namespace pywrap {
|
||||
bayesnet::status_t getStatus() const override { return bayesnet::NORMAL; };
|
||||
std::vector<std::string> topological_order() override { return std::vector<std::string>(); }
|
||||
void dump_cpt() const override {};
|
||||
void setHyperparameters(const nlohmann::json& hyperparameters) override;
|
||||
protected:
|
||||
void checkHyperparameters(const std::vector<std::string>& validKeys, const nlohmann::json& hyperparameters);
|
||||
nlohmann::json hyperparameters;
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#include "RandomForest.h"
|
||||
|
||||
namespace pywrap {
|
||||
void RandomForest::setHyperparameters(nlohmann::json& hyperparameters)
|
||||
void RandomForest::setHyperparameters(const nlohmann::json& hyperparameters)
|
||||
{
|
||||
// Check if hyperparameters are valid
|
||||
const std::vector<std::string> validKeys = { "n_estimators", "n_jobs", "random_state" };
|
||||
|
@@ -7,7 +7,7 @@ namespace pywrap {
|
||||
public:
|
||||
RandomForest() : PyClassifier("sklearn.ensemble", "RandomForestClassifier", true) {};
|
||||
~RandomForest() = default;
|
||||
void setHyperparameters(nlohmann::json& hyperparameters) override;
|
||||
void setHyperparameters(const nlohmann::json& hyperparameters) override;
|
||||
};
|
||||
} /* namespace pywrap */
|
||||
#endif /* RANDOMFOREST_H */
|
@@ -5,7 +5,7 @@ namespace pywrap {
|
||||
{
|
||||
return callMethodString("graph");
|
||||
}
|
||||
void STree::setHyperparameters(nlohmann::json& hyperparameters)
|
||||
void STree::setHyperparameters(const nlohmann::json& hyperparameters)
|
||||
{
|
||||
// Check if hyperparameters are valid
|
||||
const std::vector<std::string> validKeys = { "C", "kernel", "max_iter", "max_depth", "random_state", "multiclass_strategy" };
|
||||
|
@@ -9,7 +9,7 @@ namespace pywrap {
|
||||
STree() : PyClassifier("stree", "Stree") {};
|
||||
~STree() = default;
|
||||
std::string graph();
|
||||
void setHyperparameters(nlohmann::json& hyperparameters) override;
|
||||
void setHyperparameters(const nlohmann::json& hyperparameters) override;
|
||||
};
|
||||
} /* namespace pywrap */
|
||||
#endif /* STREE_H */
|
@@ -1,7 +1,7 @@
|
||||
#include "SVC.h"
|
||||
|
||||
namespace pywrap {
|
||||
void SVC::setHyperparameters(nlohmann::json& hyperparameters)
|
||||
void SVC::setHyperparameters(const nlohmann::json& hyperparameters)
|
||||
{
|
||||
// Check if hyperparameters are valid
|
||||
const std::vector<std::string> validKeys = { "C", "gamma", "kernel", "random_state" };
|
||||
|
@@ -7,7 +7,7 @@ namespace pywrap {
|
||||
public:
|
||||
SVC() : PyClassifier("sklearn.svm", "SVC", true) {};
|
||||
~SVC() = default;
|
||||
void setHyperparameters(nlohmann::json& hyperparameters) override;
|
||||
void setHyperparameters(const nlohmann::json& hyperparameters) override;
|
||||
};
|
||||
|
||||
} /* namespace pywrap */
|
||||
|
Reference in New Issue
Block a user