Skip to content

Commit

Permalink
fixed compilation issues v3
Browse files Browse the repository at this point in the history
  • Loading branch information
ct-clmsn committed Dec 5, 2018
1 parent 2bf0a0f commit 9e27773
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
6 changes: 2 additions & 4 deletions phylanx/plugins/algorithms/randomforest.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
protected:
hpx::future<primitive_argument_type> eval(
primitive_arguments_type const& operands,
primitive_arguments_type const& args) const;
primitive_arguments_type const& args,
eval_context ctx) const override;

public:
static match_pattern_type const match_data;
Expand All @@ -48,9 +49,6 @@ namespace phylanx { namespace execution_tree { namespace primitives
randomforest(primitive_arguments_type&& operands,
std::string const& name, std::string const& codename);

hpx::future<primitive_argument_type> eval(
primitive_arguments_type const& params) const override;

protected:
primitive_argument_type calculate_randomforest(
primitive_arguments_type&& args) const;
Expand Down
12 changes: 1 addition & 11 deletions src/plugins/algorithms/randomforest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
///////////////////////////////////////////////////////////////////////////
hpx::future<primitive_argument_type> randomforest::eval(
primitive_arguments_type const& operands,
primitive_arguments_type const& args) const
primitive_arguments_type const& args, eval_context ctx) const
{
if (operands.size() != 7)
{
Expand Down Expand Up @@ -195,14 +195,4 @@ namespace phylanx { namespace execution_tree { namespace primitives
name_, codename_));
}

hpx::future<primitive_argument_type> randomforest::eval(
primitive_arguments_type const& args) const
{
if (this->no_operands())
{
return eval(args, noargs);
}
return eval(this->operands(), args);
}

}}}

0 comments on commit 9e27773

Please sign in to comment.