biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into pygromacs
[alexxy/gromacs.git]
/
src
/
gromacs
/
gmxana
/
cmat.cpp
diff --git
a/src/gromacs/gmxana/cmat.c
b/src/gromacs/gmxana/cmat.cpp
similarity index 97%
rename from
src/gromacs/gmxana/cmat.c
rename to
src/gromacs/gmxana/cmat.cpp
index fab0b3444a4d606d4551836efe410766b32f722b..ff9aa879073d3375a79bc250ec298e4ebdb11e8d 100644
(file)
--- a/
src/gromacs/gmxana/cmat.c
+++ b/
src/gromacs/gmxana/cmat.cpp
@@
-38,6
+38,8
@@
#include "cmat.h"
#include "cmat.h"
+#include <algorithm>
+
#include "gromacs/fileio/matio.h"
#include "gromacs/fileio/xvgr.h"
#include "gromacs/legacyheaders/macros.h"
#include "gromacs/fileio/matio.h"
#include "gromacs/fileio/xvgr.h"
#include "gromacs/legacyheaders/macros.h"
@@
-127,13
+129,13
@@
void reset_index(t_mat *m)
void set_mat_entry(t_mat *m, int i, int j, real val)
{
m->mat[i][j] = m->mat[j][i] = val;
void set_mat_entry(t_mat *m, int i, int j, real val)
{
m->mat[i][j] = m->mat[j][i] = val;
- m->maxrms = max(m->maxrms, val);
+ m->maxrms =
std::
max(m->maxrms, val);
if (j != i)
{
if (j != i)
{
- m->minrms = min(m->minrms, val);
+ m->minrms =
std::
min(m->minrms, val);
}
m->sumrms += val;
}
m->sumrms += val;
- m->nn =
max(m->nn,
max(j+1, i+1));
+ m->nn =
std::max(m->nn, std::
max(j+1, i+1));
}
void done_mat(t_mat **m)
}
void done_mat(t_mat **m)