Apply clang-format to source tree

[alexxy/gromacs.git] / src / programs / mdrun / tests / mdruncomparison.h

diff --git a/src/programs/mdrun/tests/mdruncomparison.h b/src/programs/mdrun/tests/mdruncomparison.h
index 323822454a8fd638a085f53216e69924c351211e..58809a1f542e496f5a52d7685370fa96f271a8d9 100644 (file)
--- a/src/programs/mdrun/tests/mdruncomparison.h
+++ b/src/programs/mdrun/tests/mdruncomparison.h
@@ -61,72 +61,75 @@ namespace test
  *
  * \tparam FrameReader  Has readNextFrame() and frame() methods
  *                      useful for returning successive Frame objects */
-template <class FrameReader>
+template<class FrameReader>
 class FramePairManager
 {
-    public:
-        //! Convenience typedef
-        typedef std::unique_ptr<FrameReader> FrameReaderPtr;
-        //! Constructor
-        FramePairManager(FrameReaderPtr first,
-                         FrameReaderPtr second) :
-            first_(std::move(first)),
-            second_(std::move(second))
-        {}
-    private:
-        /*! \brief Probe for a pair of valid frames, and return true if both are found.
-         *
-         * Give a test failure if exactly one frame is found, because
-         * that file is longer than the other one, and this is not
-         * expected behaviour. */
-        bool shouldContinueComparing()
+public:
+    //! Convenience typedef
+    typedef std::unique_ptr<FrameReader> FrameReaderPtr;
+    //! Constructor
+    FramePairManager(FrameReaderPtr first, FrameReaderPtr second) :
+        first_(std::move(first)),
+        second_(std::move(second))
+    {
+    }
+
+private:
+    /*! \brief Probe for a pair of valid frames, and return true if both are found.
+     *
+     * Give a test failure if exactly one frame is found, because
+     * that file is longer than the other one, and this is not
+     * expected behaviour. */
+    bool shouldContinueComparing()
+    {
+        if (first_->readNextFrame())
         {
-            if (first_->readNextFrame())
+            if (second_->readNextFrame())
             {
-                if (second_->readNextFrame())
-                {
-                    // Two valid next frames exist, so we should continue comparing.
-                    return true;
-                }
-                else
-                {
-                    ADD_FAILURE() << "first file had at least one more frame than second file";
-                }
+                // Two valid next frames exist, so we should continue comparing.
+                return true;
             }
             else
             {
-                if (second_->readNextFrame())
-                {
-                    ADD_FAILURE() << "second file had at least one more frame than first file";
-                }
-                else
-                {
-                    // Both files ran out of frames at the same time, which is the expected behaviour.
-                }
+                ADD_FAILURE() << "first file had at least one more frame than second file";
             }
-            // At least one file is out of frames, so should not continue comparing.
-            return false;
         }
-    public:
-        /*! \brief Compare all possible pairs of frames using \c compareTwoFrames.
-         *
-         * \tparam Frame  The type of frame used in the comparison (returned
-         *                by FrameReader and used by compareTwoFrames). */
-        template <class Frame>
-        void compareAllFramePairs(std::function<void(const Frame &, const Frame &)> compareTwoFrames)
+        else
         {
-            while (shouldContinueComparing())
+            if (second_->readNextFrame())
+            {
+                ADD_FAILURE() << "second file had at least one more frame than first file";
+            }
+            else
             {
-                Frame firstFrame  = first_->frame();
-                Frame secondFrame = second_->frame();
-                SCOPED_TRACE("Comparing frames from two runs '" + firstFrame.frameName() + "' and '" + secondFrame.frameName() + "'");
-                compareTwoFrames(firstFrame, secondFrame);
+                // Both files ran out of frames at the same time, which is the expected behaviour.
             }
+        }
+        // At least one file is out of frames, so should not continue comparing.
+        return false;
+    }
 
+public:
+    /*! \brief Compare all possible pairs of frames using \c compareTwoFrames.
+     *
+     * \tparam Frame  The type of frame used in the comparison (returned
+     *                by FrameReader and used by compareTwoFrames). */
+    template<class Frame>
+    void compareAllFramePairs(std::function<void(const Frame&, const Frame&)> compareTwoFrames)
+    {
+        while (shouldContinueComparing())
+        {
+            Frame firstFrame  = first_->frame();
+            Frame secondFrame = second_->frame();
+            SCOPED_TRACE("Comparing frames from two runs '" + firstFrame.frameName() + "' and '"
+                         + secondFrame.frameName() + "'");
+            compareTwoFrames(firstFrame, secondFrame);
         }
-    private:
-        FrameReaderPtr first_;
-        FrameReaderPtr second_;
+    }
+
+private:
+    FrameReaderPtr first_;
+    FrameReaderPtr second_;
 };
 
 } // namespace test