canvas::Layout: support for contents margins.

[simgear.git] / simgear / structure / SGSmplstat.hxx

diff --git a/simgear/structure/SGSmplstat.hxx b/simgear/structure/SGSmplstat.hxx
index 1d1e8d57e1c498bc6c9444134b5e86c3b0301b96..272084e2560249a2f15957875cb28ddf42c377e8 100644 (file)
--- a/simgear/structure/SGSmplstat.hxx
+++ b/simgear/structure/SGSmplstat.hxx
@@ -13,20 +13,16 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the GNU Library General Public License for more details.
 You should have received a copy of the GNU Library General Public
 License along with this library; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 #ifndef SampleStatistic_h
-#ifdef __GNUG__
-#pragma interface
-#endif
+
 #define SampleStatistic_h 1
 
 
 #undef min
 #undef max
 
-using namespace std;
-
 class SampleStatistic
 {
 protected:
@@ -34,8 +30,10 @@ protected:
   double x;
   double x2;
   double minValue, maxValue;
+  double totalTime, cumulativeTime;
 
-public:  SampleStatistic ();
+public:
+  SampleStatistic ();
   inline virtual ~ SampleStatistic ();
   virtual void reset ();
 
@@ -46,37 +44,46 @@ public:  SampleStatistic ();
   double var () const;
   double min () const;
   double max () const;
+  double total () const;
+  double cumulative () const;
   double confidence (int p_percentage) const;
   double confidence (double p_value) const;
 
   void error (const char *msg);
 };
 
-// error handlers
-
-//extern void default_SampleStatistic_error_handler (const char *);
-//extern one_arg_error_handler_t SampleStatistic_error_handler;
-
-//extern one_arg_error_handler_t
-//set_SampleStatistic_error_handler (one_arg_error_handler_t f);
 
 inline SampleStatistic::SampleStatistic ()
 {
+  cumulativeTime = 0;
   reset ();
 }
+
 inline int SampleStatistic::samples () const
 {
   return (n);
 }
+
 inline double SampleStatistic::min () const
 {
   return (minValue);
 }
+
 inline double SampleStatistic::max () const
 {
   return (maxValue);
 }
 
+inline double SampleStatistic::total () const
+{
+  return (totalTime);
+}
+
+inline double SampleStatistic::cumulative () const
+{
+  return (cumulativeTime);
+}
+
 inline SampleStatistic::~SampleStatistic ()
 {
 }