Last change
on this file since 451d7a 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:
522 bytes
|
Rev | Line | |
---|
[a0bcf1] | 1 | #ifndef mergesort_h
|
---|
| 2 | #define mergesort_h
|
---|
| 3 | /*
|
---|
| 4 | Project: CP
|
---|
| 5 | Jan Hamaekers
|
---|
| 6 | 2000
|
---|
| 7 |
|
---|
| 8 | File: Mergesort
|
---|
| 9 | Usage:
|
---|
| 10 | Insert in your Code
|
---|
| 11 | #include"mergesort.h"
|
---|
| 12 | double GetKey(void *Element) { } ...
|
---|
| 13 |
|
---|
| 14 |
|
---|
| 15 | Use:
|
---|
| 16 | naturalmergesort(a,l,r,&GetKey)
|
---|
| 17 | struct Element** a
|
---|
| 18 | int l,r
|
---|
| 19 |
|
---|
| 20 | See also: GetCrd.c
|
---|
| 21 | */
|
---|
| 22 |
|
---|
| 23 | #include<stdlib.h>
|
---|
| 24 |
|
---|
| 25 | void naturalmergesort(void **a, int l, int r, double (*GetKey)(void *));
|
---|
| 26 | /* sort a[l]...a[r]
|
---|
| 27 | !!! Nutzt vorhandenen Teilfolgen aus !!!
|
---|
| 28 | C_min = O(N)
|
---|
| 29 | C_max = O(N)
|
---|
| 30 | */
|
---|
| 31 |
|
---|
| 32 | #endif
|
---|
Note:
See
TracBrowser
for help on using the repository browser.