From 3aff7aaa9de61a5f3430bd86960c4f9c4b958786 Mon Sep 17 00:00:00 2001 From: Pixel <> Date: Wed, 7 Mar 2001 00:41:50 +0000 Subject: Version finale pour les algos. --- include/BinHeap.h | 6 ++++-- include/CList.h | 1 + include/FHeap.h | 3 ++- include/PLList.h | 3 +-- include/numbers.h | 5 ++--- 5 files changed, 10 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/BinHeap.h b/include/BinHeap.h index c67239c..879267a 100644 --- a/include/BinHeap.h +++ b/include/BinHeap.h @@ -1,18 +1,20 @@ #ifndef __BINHEAP_H__ #define __BINHEAP_H__ #include +#include #define GRANUL 8 struct binheap_t { Key_t Key; Datas_t Datas; + Cell FP; }; #ifdef __cplusplus -typedef class BinHeap:public PriorityList { - private: +typedef class BinHeap:public PriorityList { private: void PackUp(int i); + CList *FP; public: BinHeap(void); // Constructor virtual ~ BinHeap(void); // Destructor diff --git a/include/CList.h b/include/CList.h index 71f2f37..c18fa9a 100644 --- a/include/CList.h +++ b/include/CList.h @@ -15,6 +15,7 @@ class CList { friend class PLList; friend class SList; friend class BHeap; + friend class BinHeap; public: CList(void); diff --git a/include/FHeap.h b/include/FHeap.h index 292540c..4b8b8fa 100644 --- a/include/FHeap.h +++ b/include/FHeap.h @@ -4,7 +4,8 @@ #define DFMAX 128 #ifdef __cplusplus -typedef class FHeap:public PriorityList { private: +typedef class FHeap:public PriorityList { + private: FHeap * Father, *Child, *Left, *Right; int Degree; bool Mark; diff --git a/include/PLList.h b/include/PLList.h index f729ffe..1b00f33 100644 --- a/include/PLList.h +++ b/include/PLList.h @@ -5,8 +5,7 @@ #include #ifdef __cplusplus -class PLList:public PriorityList { - private: +class PLList:public PriorityList { private: SList Head; public: diff --git a/include/numbers.h b/include/numbers.h index 6eba30d..692a5bb 100644 --- a/include/numbers.h +++ b/include/numbers.h @@ -4,9 +4,8 @@ #ifdef __cplusplus extern "C" { #endif -int char_to_number(char * st, int * valid); + int char_to_number(char *st, int *valid); #ifdef __cplusplus } #endif - -#endif \ No newline at end of file +#endif -- cgit v1.2.3