Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate CoreCH, fallback to using CH #4598

Closed
wants to merge 3 commits into from
Closed

Conversation

karenzshea
Copy link
Contributor

@karenzshea karenzshea commented Oct 12, 2017

Issue

Closes #4444 and #4482

Tasklist

  • update relevant Wiki pages
  • add changelog entry
  • add regression / cucumber cases (see docs/testing.md) how to test this??
  • review
  • adjust for comments

Requirements / Relations

cc @TheMarex @oxidase

Copy link
Contributor

@oxidase oxidase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Just some small changes in comments
But also

  • a deprecation message is needed in change log
  • line include/engine/search_engine_data.hpp:17 can be removed
  • a deprecation comment at include/engine/engine_config.hpp:69
  • scripts/gdb_printers.py:147 can be removed

const DataFacade<corech::Algorithm> &facade,
const PhantomNodes &phantom_nodes);

template InternalRouteResult
directShortestPathSearch(SearchEngineData<ch::Algorithm> &engine_working_data,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can also be removed but requires a definition change above to

template <>
InternalRouteResult directShortestPathSearch(SearchEngineData<ch::Algorithm> &engine_working_data,
                                             const DataFacade<ch::Algorithm> &facade,
                                             const PhantomNodes &phantom_nodes)

@@ -49,7 +49,7 @@ return_code parseArguments(int argc,
"Number of threads to use")(
"core,k",
boost::program_options::value<double>(&contractor_config.core_factor)->default_value(1.0),
"Percentage of the graph (in vertices) to contract [0..1]")(
"Percentage of the graph (in vertices) to contract [0..1]. Will always be 1.0")(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would be DEPRECATED Percentage of the graph (in vertices) to contract [0..1] better?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -65,6 +65,7 @@ struct ContractorConfig final : storage::IOConfig

unsigned requested_num_threads;

// Deprecated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please could you add also a release version when it is planed to remove, like // DEPRECATED to be removed in v6.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll open a follow up issue to track removal in v6 too

@oxidase
Copy link
Contributor

oxidase commented Oct 12, 2017

all internal usage of core_factor can be removed

EDIT: as discussed usage of core_factor should stay to support exclude flags,

Copy link
Contributor

@oxidase oxidase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EDIT: as discussed usage of core_factor should stay to support exclude flags

@karenzshea karenzshea closed this Oct 12, 2017
@karenzshea karenzshea deleted the deprecate-ch branch October 12, 2017 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants