ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/restraints/Restraints.hpp
(Generate patch)

Comparing:
trunk/OOPSE-3.0/src/restraints/Restraints.hpp (file contents), Revision 1492 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/new_design/OOPSE-3.0/src/restraints/Restraints.hpp (file contents), Revision 1826 by tim, Thu Dec 2 05:04:20 2004 UTC

# Line 10 | Line 10
10   #include <iostream>
11   #include <vector>
12  
13 + #include "primitives/StuntDouble.hpp"
14   #include "primitives/Atom.hpp"
15   #include "brains/SimState.hpp"
16  
# Line 53 | Line 54 | class Restraints{
54    double lambdaValue;
55    double lambdaK;
56  
57 <  vector<double> cofmPosX;
58 <  vector<double> cofmPosY;
59 <  vector<double> cofmPosZ;
60 <  vector<double> ubX0;
61 <  vector<double> uX0;
62 <  vector<double> ubY0;
63 <  vector<double> uY0;
64 <  vector<double> ubZ0;
65 <  vector<double> uZ0;
66 <  vector<double> vbX0;
67 <  vector<double> vX0;
68 <  vector<double> vbY0;
69 <  vector<double> vY0;
70 <  vector<double> vbZ0;
71 <  vector<double> vZ0;
57 >   std::vector<double> cofmPosX;
58 >   std::vector<double> cofmPosY;
59 >   std::vector<double> cofmPosZ;
60 >   std::vector<double> ubX0;
61 >   std::vector<double> uX0;
62 >   std::vector<double> ubY0;
63 >   std::vector<double> uY0;
64 >   std::vector<double> ubZ0;
65 >   std::vector<double> uZ0;
66 >   std::vector<double> vbX0;
67 >   std::vector<double> vX0;
68 >   std::vector<double> vbY0;
69 >   std::vector<double> vY0;
70 >   std::vector<double> vbZ0;
71 >   std::vector<double> vZ0;
72  
73    //  SimInfo *info; // all the info we'll ever need
74   //   Atom **atoms; /* array of atom pointers */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines