--- trunk/src/io/RestWriter.hpp	2006/06/22 15:21:01	993
+++ trunk/src/io/RestWriter.hpp	2010/01/20 16:04:40	1407
@@ -1,24 +1,15 @@
 /*
- * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
+ * Copyright (c) 2009 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
  * non-exclusive, royalty free, license to use, modify and
  * redistribute this software in source and binary code form, provided
  * that the following conditions are met:
  *
- * 1. Acknowledgement of the program authors must be made in any
- *    publication of scientific results based in part on use of the
- *    program.  An acceptable form of acknowledgement is citation of
- *    the article in which the program was described (Matthew
- *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
- *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
- *    Parallel Simulation Engine for Molecular Dynamics,"
- *    J. Comput. Chem. 26, pp. 252-271 (2005))
- *
- * 2. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 3. Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the
  *    distribution.
@@ -37,6 +28,15 @@
  * arising out of the use of or inability to use software, even if the
  * University of Notre Dame has been advised of the possibility of
  * such damages.
+ *
+ * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
+ * research, please cite the appropriate papers when you publish your
+ * work.  Good starting points are:
+ *                                                                      
+ * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
+ * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
+ * [4]  Vardeman & Gezelter, in progress (2009).                        
  */
  
 #ifndef IO_RESTWRITER_HPP
@@ -50,36 +50,28 @@
 #include <iostream>
 #include <fstream>
 #include <string>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <algorithm>
-#include <vector>
 #include <map>
+#include <vector>
 
-#include "primitives/Atom.hpp"
 #include "brains/SimInfo.hpp"
-#include "brains/Thermo.hpp"
-#include "primitives/StuntDouble.hpp"
+#include "restraints/Restraint.hpp"
 
-namespace oopse {
+namespace OpenMD {
 
   class RestWriter{
     
   public:
-    RestWriter( SimInfo* info );
+    RestWriter(SimInfo* info, const std::string& filename, std::vector<Restraint*> restraints);
     ~RestWriter();
-    
-    void writeZAngFile();
-    
-  private:
-    void writeZangle(std::ostream& finalOut);
 
+    void writeRest(std::vector<std::map<int, Restraint::RealPair> > restInfo);
+
+    void writeClosing(std::ostream& os);
+    
+  private:    
     SimInfo* info_;
-    std::string outName_;
+    std::ostream *output_;
+    bool createRestFile_;
   };
 
 }