summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPixel <>2001-03-07 00:41:50 +0000
committerPixel <>2001-03-07 00:41:50 +0000
commit3aff7aaa9de61a5f3430bd86960c4f9c4b958786 (patch)
treee4f83c05031ccd816a2e8e8b3bf8d9a857484fbd /include
parentcd61178eb1d3b9182f4fcb64cc8eee61971405a8 (diff)
Version finale pour les algos.
Diffstat (limited to 'include')
-rw-r--r--include/BinHeap.h6
-rw-r--r--include/CList.h1
-rw-r--r--include/FHeap.h3
-rw-r--r--include/PLList.h3
-rw-r--r--include/numbers.h5
5 files changed, 10 insertions, 8 deletions
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 <PCommon.h>
+#include <CList.h>
#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 <SList.h>
#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