biod.pnpi.spb.ru
/
alexxy
/
gromacs-spirals.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dba86f8
)
test
author
Anatoly
<Titov_AI@pnpi.nrcki.ru>
Tue, 20 Feb 2018 07:01:45 +0000
(10:01 +0300)
committer
Anatoly
<Titov_AI@pnpi.nrcki.ru>
Tue, 20 Feb 2018 07:01:45 +0000
(10:01 +0300)
src/spirals.cpp
patch
|
blob
|
history
diff --git
a/src/spirals.cpp
b/src/spirals.cpp
index 378a3e523cee3cff9c862ca5029b9824318d3256..192747313c87b0d449f1f8d3c4025d6b828f24b4 100644
(file)
--- a/
src/spirals.cpp
+++ b/
src/spirals.cpp
@@
-172,6
+172,7
@@
void linear_kernel_search (long double &x0, long double &y0, long double &z0, lo
L1 = 0;
}
}
L1 = 0;
}
}
+ std::cout << FX - Fx(x0 - L1 * FX0, y0, z0, p1, p2, p3, x) << " ";
L2 = 1;
while (Fx(x0, y0 - L2 * FY0, z0, p1, p2, p3, x) - FX > 0) {
L2 /= 2;
L2 = 1;
while (Fx(x0, y0 - L2 * FY0, z0, p1, p2, p3, x) - FX > 0) {
L2 /= 2;
@@
-179,6
+180,7
@@
void linear_kernel_search (long double &x0, long double &y0, long double &z0, lo
L2 = 0;
}
}
L2 = 0;
}
}
+ std::cout << FX - Fx(x0, y0 - L2 * FY0, z0, p1, p2, p3, x) << " ";
L3 = 1;
while (Fx(x0, y0, z0 - L3 * FZ0, p1, p2, p3, x) - FX > 0) {
L3 /= 2;
L3 = 1;
while (Fx(x0, y0, z0 - L3 * FZ0, p1, p2, p3, x) - FX > 0) {
L3 /= 2;
@@
-186,6
+188,7
@@
void linear_kernel_search (long double &x0, long double &y0, long double &z0, lo
L3 = 0;
}
}
L3 = 0;
}
}
+ std::cout << FX - Fx(x0, y0, z0 - L3 * FZ0, p1, p2, p3, x) << " ";
L4 = 1;
while (Fx(x0, y0, z0, p1 - L4 * FP1, p2, p3, x) - FX > 0) {
L4 /= 2;
L4 = 1;
while (Fx(x0, y0, z0, p1 - L4 * FP1, p2, p3, x) - FX > 0) {
L4 /= 2;
@@
-193,6
+196,7
@@
void linear_kernel_search (long double &x0, long double &y0, long double &z0, lo
L4 = 0;
}
}
L4 = 0;
}
}
+ std::cout << FX - Fx(x0, y0, z0, p1 - L4 * FP1, p2, p3, x) << " ";
L5 = 1;
while (Fx(x0, y0, z0, p1, p2 - L5 * FP2, p3, x) - FX > 0) {
L5 /= 2;
L5 = 1;
while (Fx(x0, y0, z0, p1, p2 - L5 * FP2, p3, x) - FX > 0) {
L5 /= 2;
@@
-200,6
+204,7
@@
void linear_kernel_search (long double &x0, long double &y0, long double &z0, lo
L5 = 0;
}
}
L5 = 0;
}
}
+ std::cout << FX - Fx(x0, y0, z0, p1, p2 - L5 * FP2, p3, x) << " ";
L6 = 1;
while (Fx(x0, y0, z0, p1, p2, p3 - L6 * FP3, x) - FX > 0) {
L6 /= 2;
L6 = 1;
while (Fx(x0, y0, z0, p1, p2, p3 - L6 * FP3, x) - FX > 0) {
L6 /= 2;
@@
-207,7
+212,8
@@
void linear_kernel_search (long double &x0, long double &y0, long double &z0, lo
L6 = 0;
}
}
L6 = 0;
}
}
- std::cout << FX - Fx(x0 - L1 * FX0, y0 - L2 * FY0, z0 - L3 * FZ0, p1 - L4 * FP1, p2 - L5 * FP2, p3 - L6 * FP3, x) << " ";
+ std::cout << FX - Fx(x0, y0, z0, p1, p2, p3 - L6 * FP3, x) << " ";
+ std::cout << FX - Fx(x0 - L1 * FX0, y0 - L2 * FY0, z0 - L3 * FZ0, p1 - L4 * FP1, p2 - L5 * FP2, p3 - L6 * FP3, x) << "\n";
if (FX - Fx(x0 - L1 * FX0, y0 - L2 * FY0, z0 - L3 * FZ0, p1 - L4 * FP1, p2 - L5 * FP2, p3 - L6 * FP3, x) > epsi) {
x0 -= L1 * FX0;
y0 -= L2 * FY0;
if (FX - Fx(x0 - L1 * FX0, y0 - L2 * FY0, z0 - L3 * FZ0, p1 - L4 * FP1, p2 - L5 * FP2, p3 - L6 * FP3, x) > epsi) {
x0 -= L1 * FX0;
y0 -= L2 * FY0;