Last change
on this file since f70c2a was e08f45, checked in by Frederik Heber <heber@…>, 17 years ago |
Merge branch 'ConcaveHull' of ../espack2 into ConcaveHull
Conflicts:
molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/builder.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp
util/src/NanoCreator.c
Basically, this resulted from a lot of conversions two from spaces to one tab, which is my standard indentation. The mess was caused by eclipse auto-indenting. And in espack2:ConcaveHull was the new stuff, so all from ConcaveHull was replaced in case of doubt.
Additionally, vector had ofstream << operator instead ostream << ...
|
-
Property mode
set to
100755
|
File size:
967 bytes
|
Line | |
---|
1 | #ifndef mergesort2_h
|
---|
2 | #define mergesort2_h
|
---|
3 | /** \file mergesort2.h
|
---|
4 | * Header file for \ref mergesort2.c
|
---|
5 | *
|
---|
6 | * Contains declarations of the functions implemented in \ref mergesort2.c
|
---|
7 | *
|
---|
8 | Project: CP
|
---|
9 | Jan Hamaekers
|
---|
10 | 2000
|
---|
11 |
|
---|
12 | $Id: mergesort2.h,v 1.6 2006/03/30 22:19:51 foo Exp $
|
---|
13 |
|
---|
14 | File: mergesort2.h
|
---|
15 | Usage:
|
---|
16 | Insert in your Code
|
---|
17 | #include"mergesort.h"
|
---|
18 | double GetKey(void *Element, int i, void *Args) { }
|
---|
19 | void (*CopyElement)(void *, int i, void *, int j) { }
|
---|
20 |
|
---|
21 | Use:
|
---|
22 | naturalmergesort(a, b, l,r,&GetKey,&CopyElement)
|
---|
23 | struct Element* a, *b # b Puffer Speicher reservieren !!!
|
---|
24 | int l,r
|
---|
25 | */
|
---|
26 |
|
---|
27 | #ifdef HAVE_CONFIG_H
|
---|
28 | #include <config.h>
|
---|
29 | #endif
|
---|
30 |
|
---|
31 | #include<stdlib.h>
|
---|
32 |
|
---|
33 | void naturalmergesort(void *a, void *b, int l, int r, double (*GetKey)(void *, int i, void *), void *Args, void (*CopyElement)(void *, int i, void *, int j));
|
---|
34 | /* sort a[l]...a[r]
|
---|
35 | !!! Nutzt vorhandenen Teilfolgen aus !!!
|
---|
36 | C_min = O(N)
|
---|
37 | C_max = O(N)
|
---|
38 | */
|
---|
39 |
|
---|
40 | #endif
|
---|
Note:
See
TracBrowser
for help on using the repository browser.