Changeset 8c01ce for molecuilder/src/analysis_correlation.cpp

Timestamp:

May 8, 2010, 10:05:35 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

abde75

Parents:

1775d3 (diff), 25e17e9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'jupiter/StructureRefactoring' into StructureRefactoring

File:

• molecuilder/src/analysis_correlation.cpp (modified) (2 diffs)

molecuilder/src/analysis_correlation.cpp

@@ -131 +131 @@
                                 checkOtherX = Vector(Othern[0], Othern[1], Othern[2]) + periodicOtherX;
                                 checkOtherX.MatrixMultiplication(FullMatrix);
-                                distance = checkX.Distance(checkOtherX);
+                                distance = checkX.distance(checkOtherX);
                                 //Log() << Verbose(1) <<"Inserting " << *Walker << " and " << *OtherWalker << endl;
                                 outmap->insert ( pair<double, pair <atom *, atom*> > (distance, pair<atom *, atom*> (Walker, OtherWalker) ) );
@@ -224 +224 @@
                 checkX = Vector(n[0], n[1], n[2]) + periodicX;
                 checkX.MatrixMultiplication(FullMatrix);
-                distance = checkX.Distance(*point);
+                distance = checkX.distance(*point);
                 DoLog(4) && (Log() << Verbose(4) << "Current distance is " << distance << "." << endl);
                 outmap->insert ( pair<double, pair<atom *, const Vector*> >(distance, pair<atom *, const Vector*> (Walker, point) ) );