cluster_search/commit
Changed the name of the settings.
author | Chris Dijkshoorn |
---|---|
Sat Dec 13 17:46:50 2014 +0100 | |
committer | Chris Dijkshoorn |
Sat Dec 13 17:46:50 2014 +0100 | |
commit | 50f9da3ff10099eb93499dade4abee175c308bc5 |
tree | e7961c40b3eb1ad5d6013d65d795135fef36e1fc |
parent | ad845e35e562dcc103fd3199601b4303aeb2fc37 |
Diff style: patch stat
diff --git a/api/cluster_search.pl b/api/cluster_search.pl index df3065a..b567bd5 100644 --- a/api/cluster_search.pl +++ b/api/cluster_search.pl @@ -134,7 +134,7 @@ search_graph(_, []). % the value a list of corresponding elements from Items. group_targets_by_value(GroupBy, Targets, Graph, Clusters, Options) :- memberchk(GroupBy, [path,spath]), - setting(search:search_path, Default), + setting(cluster_search:search_path, Default), option(searchPath(Method), Options, Default), result_paths(Targets, Method, GroupBy, Graph, Pairs0), keysort(Pairs0, Pairs), diff --git a/lib/cluster_search/cs_filter.pl b/lib/cluster_search/cs_filter.pl index 88beb2d..15f9d66 100644 --- a/lib/cluster_search/cs_filter.pl +++ b/lib/cluster_search/cs_filter.pl @@ -90,7 +90,7 @@ filter_to_goal(Filter, R, RMap, QMap, Goal) :- filter(Filter, R, RMap, QMap, Goal). search_filter([], [type(Class)]) :- !, - setting(search:basic_search_target, Class). + setting(cluster_search:basic_search_target, Class). search_filter(Filter, Filter). %% filter_to_conj_goal(+FilterList, +R, -Goal) diff --git a/lib/cluster_search/graph_search.pl b/lib/cluster_search/graph_search.pl index c1a79ab..3a4d9f4 100644 --- a/lib/cluster_search/graph_search.pl +++ b/lib/cluster_search/graph_search.pl @@ -36,7 +36,7 @@ graph_search(+, -, t). graph_search(Keyword, State, Options) :- - setting(search:graphSearchCache, false), !, + setting(cluster_search:graphSearchCache, false), !, do_graph_search(Keyword, State, Options). graph_search(Keyword, State, Options) :- @@ -49,7 +49,7 @@ graph_search(Keyword, State, Options) :- ). do_graph_search(Keyword, State, Options) :- - setting(search:basic_search_target, SearchTarget), + setting(cluster_search:basic_search_target, SearchTarget), filter_to_goal([type(SearchTarget)], R, Goal, Options), TargetCond = target_goal(Goal, R), rdf_backward_search(Keyword, TargetCond, State, Options), @@ -98,7 +98,7 @@ flush_graph_search_cache :- push_graph_search_cache(Key, Kwd, Options, State) :- graph_search_cache(Key, Kwd, Options, State), !. push_graph_search_cache(Key, Kwd, Options, State) :- - setting(search:graphSearchCacheSize, Max), + setting(cluster_search:graphSearchCacheSize, Max), ( Max == 0 -> true ; predicate_property(graph_search_cache(_,_,_,_), number_of_clauses(Size)), diff --git a/lib/cluster_search/rdf_backward_search.pl b/lib/cluster_search/rdf_backward_search.pl index 257b332..a5b6a85 100644 --- a/lib/cluster_search/rdf_backward_search.pl +++ b/lib/cluster_search/rdf_backward_search.pl @@ -33,7 +33,7 @@ rdf_backward_search(Keyword, TargetCond, State, Options) :- Expand = rdf_backward_search:edge, - setting(search:steps, DefSteps), + setting(cluster_search:steps, DefSteps), option(steps(Steps0), Options, DefSteps), ( Steps0 == 0 -> Steps = -1 diff --git a/lib/cluster_search/rdf_full_search.pl b/lib/cluster_search/rdf_full_search.pl index 6a6c3d0..da4d265 100644 --- a/lib/cluster_search/rdf_full_search.pl +++ b/lib/cluster_search/rdf_full_search.pl @@ -50,7 +50,7 @@ rdf_full_search(Keyword, TargetCond, State, Options) :- Expand = rdf_full_search:edge, - setting(search:steps, DefSteps), + setting(cluster_search:steps, DefSteps), option(steps(Steps0), Options, DefSteps), ( Steps0 == 0 -> Steps = -1 diff --git a/lib/cluster_search/settings.pl b/lib/cluster_search/settings.pl index 1804f91..eec7078 100644 --- a/lib/cluster_search/settings.pl +++ b/lib/cluster_search/settings.pl @@ -6,32 +6,32 @@ * Cluster search settings ***************************************************/ -:- setting(search:basic_search_target, uri, 'http://www.europeana.eu/schemas/edm/ProvidedCHO', +:- setting(cluster_search:basic_search_target, uri, 'http://www.europeana.eu/schemas/edm/ProvidedCHO', 'Default Target for search'). -:- setting(search:threshold, float, 0.05, +:- setting(cluster_search:threshold, float, 0.05, 'Graph-search threshold'). -:- setting(search:literal_threshold, float, 0.05, +:- setting(cluster_search:literal_threshold, float, 0.05, 'Literal-search threshold'). -:- setting(search:literal_score, boolean, true, +:- setting(cluster_search:literal_score, boolean, true, 'Use score of string match in threshold of graph search'). -:- setting(search:steps, nonneg, 1000, +:- setting(cluster_search:steps, nonneg, 1000, 'Maximum number of steps in the graph search (0 is unbound)'). -:- setting(search:edge_limit, nonneg, 0, +:- setting(cluster_search:edge_limit, nonneg, 0, 'Limit extension of Node with a maximum number of edges \c (0 is unbound)'). -:- setting(search:max, nonneg, 100, +:- setting(cluster_search:max, nonneg, 100, 'Maximum number of results shown in the output'). -:- setting(search:cluster, oneof([concept, path, spath, role]), spath, +:- setting(cluster_search:cluster, oneof([concept, path, spath, role]), spath, 'Create clusters by graph path or schema path'). -:- setting(search:search_path, oneof([best, breadth]), best, +:- setting(cluster_search:search_path, oneof([best, breadth]), best, 'Create clusters on best or shortest path'). -:- setting(search:sort, oneof([score, path_length, false]), score, +:- setting(cluster_search:sort, oneof([score, path_length, false]), score, 'Sort the results by'). -:- setting(search:prune, boolean, true, +:- setting(cluster_search:prune, boolean, true, 'Prune the search Graph'). -:- setting(search:search_type, oneof([literal,concept,backward]), backward, +:- setting(cluster_search:search_type, oneof([literal,concept,backward]), backward, 'Method to traverse the graph'). -:- setting(search:graphSearchCache, boolean, false, +:- setting(cluster_search:graphSearchCache, boolean, false, 'Cache graph search results'). -:- setting(search:graphSearchCacheSize, nonneg, 50, +:- setting(cluster_search:graphSearchCacheSize, nonneg, 50, 'Maximum searches kept in cache (0 is unbound)'). diff --git a/lib/cluster_search/tree_abstract.pl b/lib/cluster_search/tree_abstract.pl index a1f6488..8de25cc 100644 --- a/lib/cluster_search/tree_abstract.pl +++ b/lib/cluster_search/tree_abstract.pl @@ -273,7 +273,7 @@ tree_test(Keyword, Max, Tree) :- do_query(Keyword, State) :- - setting(search:basic_search_target, Class), + setting(cluster_search:basic_search_target, Class), Filter = [type(Class)], graph_search(Keyword, State, [filter(Filter),prune(true),literal_threshold(0)]).