Changeset dd3a80

Timestamp:

Mar 3, 2010, 7:10:36 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

bc46c1

Parents:

f78203

git-author:

Frederik Heber <heber@…> (03/03/10 18:41:03)

git-committer:

Frederik Heber <heber@…> (03/03/10 19:10:36)

Message:

BUGFIX: rounding imprecision let values appear twice in BinMap.

• we fix this by always converting bin to integer and then back to double when putting into map in BinData()
• GetBin returns integer

Signed-off-by: Frederik Heber <heber@…>

Location:

molecuilder/src

Files:

• analysis_correlation.cpp (modified) (1 diff)
• analysis_correlation.hpp (modified) (3 diffs)

molecuilder/src/analysis_correlation.cpp

@@ -342 +342 @@
 };
 
-/** Returns the start of the bin for a given value.
+/** Returns the index of the bin for a given value.
  * \param value value whose bin to look for
  * \param BinWidth width of bin
  * \param BinStart first bin
  */
-double GetBin ( const double value, const double BinWidth, const double BinStart )
-{
-  Info FunctionInfo(__func__);
-  double bin =(double) (floor((value - BinStart)/BinWidth));
-  return (bin*BinWidth+BinStart);
+int GetBin ( const double value, const double BinWidth, const double BinStart )
+{
+  Info FunctionInfo(__func__);
+  int bin =(int) (floor((value - BinStart)/BinWidth));
+  return (bin);
 };
 

molecuilder/src/analysis_correlation.hpp

@@ -51 +51 @@
 CorrelationToPointMap *PeriodicCorrelationToPoint(MoleculeListClass * const &molecules, const element * const type, const Vector *point, const int ranges[NDIM] );
 CorrelationToSurfaceMap *PeriodicCorrelationToSurface(MoleculeListClass * const &molecules, const element * const type, const Tesselation * const Surface, const LinkedCell *LC, const int ranges[NDIM] );
-double GetBin ( const double value, const double BinWidth, const double BinStart );
+int GetBin ( const double value, const double BinWidth, const double BinStart );
 void OutputCorrelation( ofstream * const file, const BinPairMap * const map );
 void OutputPairCorrelation( ofstream * const file, const BinPairMap * const map );
@@ -101 +101 @@
 {
   BinPairMap *outmap = new BinPairMap;
-  double bin = 0.;
+  int bin = 0;
   double start = 0.;
   double end = 0.;
@@ -117 +117 @@
     start = BinStart;
     end = BinEnd;
-    for (double runner = start; runner <= end; runner += BinWidth)
-      outmap->insert( pair<double, int> (runner, 0) );
+    for (int runner = 0; runner <= ceil((end-start)/BinWidth); runner++)
+      outmap->insert( pair<double, int> ((double)runner*BinWidth+start, 0) );
   }
 
   for (typename T::iterator runner = map->begin(); runner != map->end(); ++runner) {
     bin = GetBin (runner->first, BinWidth, start);
-    BinPairMapInserter = outmap->insert ( pair<double, int> (bin, 1) );
+    BinPairMapInserter = outmap->insert ( pair<double, int> ((double)bin*BinWidth+start, 1) );
     if (!BinPairMapInserter.second) {  // bin already present, increase
       BinPairMapInserter.first->second += 1;