Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / analysisdata / dataproxy.h

diff --git a/src/gromacs/analysisdata/dataproxy.h b/src/gromacs/analysisdata/dataproxy.h
index 1f0c3020487f9035c90758082843287a54eddc87..d4c6af3b8fbe148eee8858ce68cdd1a86fa0bae8 100644 (file)
--- a/src/gromacs/analysisdata/dataproxy.h
+++ b/src/gromacs/analysisdata/dataproxy.h
@@ -1,10 +1,10 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012, by the GROMACS development team, led by
- * David van der Spoel, Berk Hess, Erik Lindahl, and including many
- * others, as listed in the AUTHORS file in the top-level source
- * directory and at http://www.gromacs.org.
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
  *
  * GROMACS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -45,13 +45,14 @@
 #ifndef GMX_ANALYSISDATA_DATAPROXY_H
 #define GMX_ANALYSISDATA_DATAPROXY_H
 
-#include "abstractdata.h"
-#include "datamodule.h"
+#include "gromacs/analysisdata/abstractdata.h"
+#include "gromacs/analysisdata/datamodule.h"
 
 namespace gmx
 {
 
-/*! \internal \brief
+/*! \internal
+ * \brief
  * Internal implementation class used to implement column modules.
  *
  * This class serves as a proxy between AbstractAnalysisData and the attached
@@ -79,9 +80,14 @@ class AnalysisDataProxy : public AbstractAnalysisData,
         AnalysisDataProxy(int firstColumn, int columnSpan,
                           AbstractAnalysisData *data);
 
+        virtual int frameCount() const;
+
         virtual int flags() const;
 
         virtual void dataStarted(AbstractAnalysisData *data);
+        virtual bool parallelDataStarted(
+            AbstractAnalysisData              *data,
+            const AnalysisDataParallelOptions &options);
         virtual void frameStarted(const AnalysisDataFrameHeader &frame);
         virtual void pointsAdded(const AnalysisDataPointSetRef &points);
         virtual void frameFinished(const AnalysisDataFrameHeader &header);
@@ -94,6 +100,7 @@ class AnalysisDataProxy : public AbstractAnalysisData,
         AbstractAnalysisData   &source_;
         int                     firstColumn_;
         int                     columnSpan_;
+        bool                    bParallel_;
 
         // Copy and assign disallowed by base.
 };