X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FBase%2FMori.h;fp=lib%2Ffpa%2FBase%2FMori.h;h=e7ea726eab3c61809d5c7f2b8f9e1cc878ee5b61;hb=c9542e420b94b0bfc1f285599f7816eab1191519;hp=27f6915a671a8893805afc193973e9eb491278fc;hpb=5bf766068f54d061d3816f4950a076c3cf3a4d8b;p=FrontAlgorithms.git diff --git a/lib/fpa/Base/Mori.h b/lib/fpa/Base/Mori.h index 27f6915..e7ea726 100644 --- a/lib/fpa/Base/Mori.h +++ b/lib/fpa/Base/Mori.h @@ -10,8 +10,8 @@ #include #include #include - #include +#include #include namespace fpa @@ -30,12 +30,17 @@ namespace fpa typedef itk::SmartPointer< Self > Pointer; typedef itk::SmartPointer< const Self > ConstPointer; - typedef typename _TAlgorithm::TNode TNode; - typedef typename _TAlgorithm::TNodes TNodes; - typedef typename _TAlgorithm::TInputValue TInputValue; - typedef typename _TAlgorithm::TOutputValue TOutputValue; - typedef typename _TAlgorithm::TFrontId TFrontId; - typedef typename _TAlgorithm::TVertex TVertex; + typedef typename _TAlgorithm::TTraits TTraits; + fpa_Base_TraitTypes( typename TTraits ); + + /* TODO + typedef typename _TAlgorithm::TNode TNode; + typedef typename _TAlgorithm::TNodes TNodes; + typedef typename _TAlgorithm::TInputValue TInputValue; + typedef typename _TAlgorithm::TOutputValue TOutputValue; + typedef typename _TAlgorithm::TFrontId TFrontId; + typedef typename _TAlgorithm::TVertex TVertex; + */ typedef std::deque< TNode > TQueue; typedef std::set< TInputValue > TThresholds;