From f75c6316857d8c6dc249379b28075a21c01c4fdf Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 16 Apr 2020 19:44:05 +0200 Subject: [PATCH] solving some inconsistencies --- colibricore_classes.in.pxd | 8 ++++---- include/patternmodel.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/colibricore_classes.in.pxd b/colibricore_classes.in.pxd index c970a8b..ad1c6f0 100644 --- a/colibricore_classes.in.pxd +++ b/colibricore_classes.in.pxd @@ -430,10 +430,10 @@ cdef extern from "patternmodel.h": - t_relationmap getsubchildren(Pattern & pattern, unsigned int occurrencethreshold, unsigned int category, unsigned int size) except +KeyError - t_relationmap getsubparents(Pattern & pattern, unsigned int occurrencethreshold, unsigned int category, unsigned int size) except +KeyError - t_relationmap getleftneighbours(Pattern & pattern, unsigned int occurrencethreshold, unsigned int category, unsigned int size, unsigned int cutoff) except +KeyError - t_relationmap getrightneighbours(Pattern & pattern, unsigned int occurrencethreshold, unsigned int category, unsigned int size, unsigned int cutoff) except +KeyError + t_relationmap getsubchildren(Pattern & pattern, unsigned int occurrencethreshold, int category, unsigned int size) except +KeyError + t_relationmap getsubparents(Pattern & pattern, unsigned int occurrencethreshold, int category, unsigned int size) except +KeyError + t_relationmap getleftneighbours(Pattern & pattern, unsigned int occurrencethreshold, int category, unsigned int size, unsigned int cutoff) except +KeyError + t_relationmap getrightneighbours(Pattern & pattern, unsigned int occurrencethreshold, int category, unsigned int size, unsigned int cutoff) except +KeyError t_relationmap getskipcontent(Pattern & pattern) except +KeyError t_relationmap gettemplates(Pattern & pattern, unsigned int occurrencethreshold) except +KeyError t_relationmap getinstances(Pattern & pattern, unsigned int occurrencethreshold) except +KeyError diff --git a/include/patternmodel.h b/include/patternmodel.h index c807882..2c49d90 100644 --- a/include/patternmodel.h +++ b/include/patternmodel.h @@ -2514,8 +2514,8 @@ class PatternModel: public MapType, public PatternModelInterface { virtual void outputrelations(const PatternPointer & , ClassDecoder & , std::ostream *, const std::string = "", bool=true) {} //does nothing for unindexed models virtual t_relationmap getsubchildren(const PatternPointer & , unsigned int = 0, int = 0, unsigned int = 0) { return t_relationmap(); } //does nothing for unindexed models virtual t_relationmap getsubparents(const PatternPointer &, unsigned int = 0, int = 0, unsigned int = 0) { return t_relationmap(); } //does nothing for unindexed models - virtual t_relationmap gettemplates(const PatternPointer & ,int = 0) { return t_relationmap(); } //does nothing for unindexed models - virtual t_relationmap getinstances(const PatternPointer & ,int = 0) { return t_relationmap(); } //does nothing for unindexed models + virtual t_relationmap gettemplates(const PatternPointer &, unsigned int = 0) { return t_relationmap(); } //does nothing for unindexed models + virtual t_relationmap getinstances(const PatternPointer &, unsigned int = 0) { return t_relationmap(); } //does nothing for unindexed models virtual t_relationmap getskipcontent(const PatternPointer & ) { return t_relationmap(); } //does nothing for unindexed models virtual t_relationmap getleftneighbours(const PatternPointer &, unsigned int = 0, int = 0, unsigned int = 0, unsigned int =0) { return t_relationmap(); } //does nothing for unindexed models virtual t_relationmap getrightneighbours(const PatternPointer &, unsigned int = 0, int = 0, unsigned int = 0, unsigned int =0) { return t_relationmap(); } //does nothing for unindexed models