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
100644
|
File size:
955 bytes
|
Line | |
---|
1 | /*
|
---|
2 | * ellipsoid.hpp
|
---|
3 | *
|
---|
4 | * Created on: Jan 20, 2009
|
---|
5 | * Author: heber
|
---|
6 | */
|
---|
7 |
|
---|
8 | #ifndef ELLIPSOID_HPP_
|
---|
9 | #define ELLIPSOID_HPP_
|
---|
10 |
|
---|
11 | // include config.h
|
---|
12 | #ifdef HAVE_CONFIG_H
|
---|
13 | #include <config.h>
|
---|
14 | #endif
|
---|
15 |
|
---|
16 | #include <cstdlib>
|
---|
17 |
|
---|
18 | #include "boundary.hpp"
|
---|
19 | #include "vector.hpp"
|
---|
20 |
|
---|
21 | double SquaredDistanceToEllipsoid(Vector &x, Vector &EllipsoidCenter, double *EllipsoidLength, double *EllipsoidAngle);
|
---|
22 | double SumSquaredDistance (const gsl_vector * x, void * params);
|
---|
23 | bool FitPointSetToEllipsoid(ofstream *out, Vector *set, int N, Vector *EllipsoidCenter, double *EllipsoidLength, double *EllipsoidAngle);
|
---|
24 | void PickRandomPointSet(ofstream *out, class Tesselation *T, Vector *&x, int N);
|
---|
25 | void PickRandomNeighbouredPointSet(ofstream *out, class Tesselation *T, class LinkedCell *LC, Vector *&x, int PointsToPick);
|
---|
26 | void FindDistributionOfEllipsoids(ofstream *out, class Tesselation *T, class LinkedCell *LCList, int N, int number, const char *filename);
|
---|
27 |
|
---|
28 | #endif /* ELLIPSOID_HPP_ */
|
---|
Note:
See
TracBrowser
for help on using the repository browser.