ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/utils/Tuple.hpp
(Generate patch)

Comparing:
trunk/src/utils/Tuple.hpp (file contents), Revision 164 by tim, Wed Oct 27 06:07:09 2004 UTC vs.
branches/development/src/utils/Tuple.hpp (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 1 | Line 1
1 < #ifndef UTILS_TUPLE_HPP
2 < #define UTILS_TUPLE_HPP
3 <
4 < namespace oopse {
5 <
6 < template <class T1, class T2, class T3>
7 < struct tuple3 {
8 <    typedef T1 first_type;
9 <    typedef T2 second_type;
10 <    typedef T3 third_type;
11 <
12 <    T1 first;
13 <    T2 second;
14 <    T3 third;
15 <    tuple3() {}
16 <    tuple3(const T1& a, const T2& b, const T3& c) : first(a), second(b), third(c) {}
17 < };
18 <
19 < template <class T1, class T2, class T3>
20 < tuple3<T1,T2,T3> make_tuple3( T1 t1, T2 t2, T3 t3 ) {
21 <    return tuple3<T1,T2,T3>( t1, t2, t3 );
22 < }
23 <
24 <
25 < template <class T1, class T2, class T3, class T4>
26 < struct tuple4 {
27 <    typedef T1 first_type;
28 <    typedef T2 second_type;
29 <    typedef T3 third_type;
30 <    typedef T4 fourth_type;
31 <
32 <    T1 first;
33 <    T2 second;
34 <    T3 third;
35 <    T4 fourth;
36 <    tuple4() {}
37 <    tuple4(const T1& a, const T2& b, const T3& c, const T4& d)
38 <    : first(a), second(b), third(c), fourth(d) {}
39 < };
40 <
41 < template <class T1, class T2, class T3, class T4>
42 < tuple4<T1,T2,T3,T4> make_tuple4( T1 t1, T2 t2, T3 t3, T4 t4 ) {
43 <    return tuple4<T1,T2,T3,T4>( t1, t2, t3, t4 );
44 < }
45 <
46 < }
47 < #endif //UTILS_TUPLE_HPP
48 <
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 > *
4 > * The University of Notre Dame grants you ("Licensee") a
5 > * non-exclusive, royalty free, license to use, modify and
6 > * redistribute this software in source and binary code form, provided
7 > * that the following conditions are met:
8 > *
9 > * 1. Redistributions of source code must retain the above copyright
10 > *    notice, this list of conditions and the following disclaimer.
11 > *
12 > * 2. Redistributions in binary form must reproduce the above copyright
13 > *    notice, this list of conditions and the following disclaimer in the
14 > *    documentation and/or other materials provided with the
15 > *    distribution.
16 > *
17 > * This software is provided "AS IS," without a warranty of any
18 > * kind. All express or implied conditions, representations and
19 > * warranties, including any implied warranty of merchantability,
20 > * fitness for a particular purpose or non-infringement, are hereby
21 > * excluded.  The University of Notre Dame and its licensors shall not
22 > * be liable for any damages suffered by licensee as a result of
23 > * using, modifying or distributing the software or its
24 > * derivatives. In no event will the University of Notre Dame or its
25 > * licensors be liable for any lost revenue, profit or data, or for
26 > * direct, indirect, special, consequential, incidental or punitive
27 > * damages, however caused and regardless of the theory of liability,
28 > * arising out of the use of or inability to use software, even if the
29 > * University of Notre Dame has been advised of the possibility of
30 > * such damages.
31 > *
32 > * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 > * research, please cite the appropriate papers when you publish your
34 > * work.  Good starting points are:
35 > *                                                                      
36 > * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 > * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 > * [4]  Vardeman & Gezelter, in progress (2009).                        
40 > */
41 >
42 > #ifndef UTILS_TUPLE_HPP
43 > #define UTILS_TUPLE_HPP
44 >
45 > namespace OpenMD {
46 >
47 >  template <class T1, class T2, class T3>
48 >  struct tuple3 {
49 >    typedef T1 first_type;
50 >    typedef T2 second_type;
51 >    typedef T3 third_type;
52 >
53 >    T1 first;
54 >    T2 second;
55 >    T3 third;
56 >    tuple3() {}
57 >    tuple3(const T1& a, const T2& b, const T3& c) : first(a), second(b), third(c) {}
58 >  };
59 >
60 >  template <class T1, class T2, class T3>
61 >  tuple3<T1,T2,T3> make_tuple3( T1 t1, T2 t2, T3 t3 ) {
62 >    return tuple3<T1,T2,T3>( t1, t2, t3 );
63 >  }
64 >
65 >
66 >  template <class T1, class T2, class T3, class T4>
67 >  struct tuple4 {
68 >    typedef T1 first_type;
69 >    typedef T2 second_type;
70 >    typedef T3 third_type;
71 >    typedef T4 fourth_type;
72 >
73 >    T1 first;
74 >    T2 second;
75 >    T3 third;
76 >    T4 fourth;
77 >    tuple4() {}
78 >    tuple4(const T1& a, const T2& b, const T3& c, const T4& d)
79 >      : first(a), second(b), third(c), fourth(d) {}
80 >  };
81 >
82 >  template <class T1, class T2, class T3, class T4>
83 >  tuple4<T1,T2,T3,T4> make_tuple4( T1 t1, T2 t2, T3 t3, T4 t4 ) {
84 >    return tuple4<T1,T2,T3,T4>( t1, t2, t3, t4 );
85 >  }
86 >
87 > template<class T1, class T2, class T3>
88 > inline bool operator < (const tuple3<T1, T2, T3>& t1, const tuple3<T1, T2, T3>& t2) {
89 >
90 >        return t1.first < t2.first
91 >             || (!(t2.first < t1.first) && t1.second < t2.second)
92 >             || (!(t2.first < t1.first) && !(t2.second < t2.second) && t1.third < t2.third);
93 > }
94 >
95 >
96 > inline bool operator < (const tuple3<int, int, std::vector<std::string> >& t1, const tuple3<int, int, std::vector<std::string> >& t2) {
97 >  
98 >  if (t1.first < t2.first)
99 >    return true;
100 >  else {
101 >    if (t1.first > t2.first)
102 >      return false;
103 >    
104 >    if (t1.second < t2.second)
105 >      return true;
106 >    else
107 >      if (t1.second > t2.second)
108 >        return false;
109 >    
110 >    return true;
111 >  }  
112 > }
113 >
114 > template<class T1, class T2, class T3, class T4>
115 > inline bool operator < (const tuple4<T1, T2, T3, T4>& t1, const tuple4<T1, T2, T3, T4>& t2) {
116 >
117 >        return t1.first < t2.first
118 >             || (!(t2.first < t1.first) && t1.second < t2.second)
119 >             || (!(t2.first < t1.first) && !(t2.second < t2.second) && t1.third < t2.third)
120 >             ||(!(t2.first < t1.first) && !(t2.second < t2.second) && !(t2.third < t1.third) && t1.fourth < t2.fourth);
121 > }
122 > typedef tuple3<int, int, int> IntTuple3;
123 > typedef tuple4<int, int, int, int> IntTuple4;
124 >
125 > }
126 >
127 >
128 > #endif //UTILS_TUPLE_HPP
129 >

Comparing:
trunk/src/utils/Tuple.hpp (property svn:keywords), Revision 164 by tim, Wed Oct 27 06:07:09 2004 UTC vs.
branches/development/src/utils/Tuple.hpp (property svn:keywords), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines