Changeset bc46c1 for molecuilder/src/analysis_correlation.cpp

Timestamp:

Mar 3, 2010, 7:13:43 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

b1c92e

Parents:

1c7aed (diff), dd3a80 (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 branch 'FixGetBin_tointeger' into FixBinDataStartEnd

File:

• molecuilder/src/analysis_correlation.cpp (modified) (1 diff)

molecuilder/src/analysis_correlation.cpp

@@ -350 +350 @@
 };
 
-/** 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);
 };