ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/brains/Exclude.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/brains/Exclude.cpp (file contents):
Revision 1492 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC

# Line 1 | Line 1
1 < #include <iostream>
2 < #include <stdlib.h>
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. Acknowledgement of the program authors must be made in any
10 > *    publication of scientific results based in part on use of the
11 > *    program.  An acceptable form of acknowledgement is citation of
12 > *    the article in which the program was described (Matthew
13 > *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 > *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 > *    Parallel Simulation Engine for Molecular Dynamics,"
16 > *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 > *
18 > * 2. Redistributions of source code must retain the above copyright
19 > *    notice, this list of conditions and the following disclaimer.
20 > *
21 > * 3. Redistributions in binary form must reproduce the above copyright
22 > *    notice, this list of conditions and the following disclaimer in the
23 > *    documentation and/or other materials provided with the
24 > *    distribution.
25 > *
26 > * This software is provided "AS IS," without a warranty of any
27 > * kind. All express or implied conditions, representations and
28 > * warranties, including any implied warranty of merchantability,
29 > * fitness for a particular purpose or non-infringement, are hereby
30 > * excluded.  The University of Notre Dame and its licensors shall not
31 > * be liable for any damages suffered by licensee as a result of
32 > * using, modifying or distributing the software or its
33 > * derivatives. In no event will the University of Notre Dame or its
34 > * licensors be liable for any lost revenue, profit or data, or for
35 > * direct, indirect, special, consequential, incidental or punitive
36 > * damages, however caused and regardless of the theory of liability,
37 > * arising out of the use of or inability to use software, even if the
38 > * University of Notre Dame has been advised of the possibility of
39 > * such damages.
40 > */
41 >
42 > #include <functional>
43 > #include <iterator>
44 > #include <utility>
45  
46   #include "brains/Exclude.hpp"
47  
48 < Exclude* Exclude::_instance = 0;
48 > namespace oopse {
49  
50 < Exclude* Exclude::Instance() {
9 <  if (_instance == 0) {
10 <    _instance = new Exclude;
11 <  }
12 <  return _instance;
13 < }
50 > int *Exclude::getExcludeList() {
51  
52 < Exclude::Exclude(){  
53 <  exPairs = NULL;
17 <  newFortranArrayNeeded = 1;
18 < }
52 >    if (modified_) {
53 >        excludeList_.clear();
54  
55 < Exclude::~Exclude() {
56 <  if (exPairs != NULL) {
57 <    delete[] exPairs;
58 <  }
59 <  delete _instance;
55 >        for (std::set<std::pair<int,int> >::iterator i = excludeSet_.begin();i != excludeSet_.end(); ++i) {
56 >            excludeList_.push_back(i->first + 1);
57 >            excludeList_.push_back(i->second + 1);            
58 >        }
59 >        modified_ = false;
60 >    }
61 >
62 >    return excludeList_.size() > 0 ? &(excludeList_[0]) : NULL;    
63   }
26  
27 int* Exclude::getFortranArray(){
28  
29  set<pair<int, int> >::iterator  i;
30  int j;
64  
65 <  if (newFortranArrayNeeded != 0) {
66 <    delete[] exPairs;
67 <    exPairs = new int[2*getSize()];  
68 <    j = 0;
69 <    for(i = excludeSet.begin(); i != excludeSet.end(); ++i) {  
70 <      exPairs[j] = (*i).first;
38 <      j++;
39 <      exPairs[j] = (*i).second;
40 <      j++;
65 > void Exclude::addPair(int i, int j) {
66 >
67 >    if (i == j) {
68 >        return;
69 >    } else if (i > j) {
70 >        std::swap(i, j);
71      }
72 <    newFortranArrayNeeded = 0;
73 <  }
74 <
75 <  return exPairs;  
72 >
73 >    std::set<std::pair<int, int> >::iterator iter = excludeSet_.find(std::make_pair(i, j));
74 >
75 >    if (iter == excludeSet_.end()) {
76 >        excludeSet_.insert(std::make_pair(i, j));
77 >        modified_ = true;
78 >    }
79   }
80  
81 + void Exclude::removePair(int i, int j) {
82  
83 < void Exclude::addPair(int i, int j) {
84 <  
85 <  if (!hasPair(i, j)) {
86 <
53 <    if (i != j) {
54 <      
55 <      if (i < j)
56 <        excludeSet.insert(make_pair(i, j));
57 <      else
58 <        excludeSet.insert(make_pair(j, i));
83 >    if (i == j) {
84 >        return;
85 >    } else if (i > j) {
86 >        std::swap(i, j);
87      }
88  
61    newFortranArrayNeeded = 1;
62  }
89  
90 +    std::set<std::pair<int, int> >::iterator iter = excludeSet_.find(std::make_pair(i, j));
91 +
92 +    if (iter != excludeSet_.end()) {
93 +        excludeSet_.erase(iter);
94 +        modified_ = true;
95 +    }
96   }
97  
98 + bool Exclude::hasPair(int i, int j) {
99  
100 < void Exclude::printMe( void ){
100 >    if (i == j) {
101 >        return false;
102 >    } else if (i > j) {
103 >        std::swap(i, j);
104 >    }
105  
106 <  set<pair<int, int> >::iterator  i;
107 <  int index;
108 <  
72 <  index = 0;
73 <  for(i = excludeSet.begin(); i != excludeSet.end(); ++i) {  
106 >    std::set<std::pair<int, int> >::iterator  iter = excludeSet_.find(std::make_pair(i, j));
107 >    return iter == excludeSet_.end() ? false : true;
108 > }
109  
110 <    std::cerr << "exclude[" << index << "] i, j: " << (*i).first << " - " << (*i).second << "\n";
111 <    index++;
77 <  
78 <  }  
110 > int Exclude::getSize() {
111 >    return excludeSet_.size();
112   }
113  
114 < int Exclude::hasPair(int i, int j) {
114 > std::ostream& operator <<(std::ostream& o, Exclude& e) {
115 >    std::set<std::pair<int, int> >::iterator i;
116  
117 <  set<pair<int, int> >::iterator  position;
117 >    int index;
118  
119 <  if (i != j) {  
86 <    if (i < j)
87 <      position = excludeSet.find(make_pair(i, j));
88 <    else
89 <      position = excludeSet.find(make_pair(j, i));
119 >    index = 0;
120  
121 <    if (position != excludeSet.end())
122 <      return 1;
123 <    else
124 <      return 0;
125 <  } else
126 <    return 0;
121 >    for(i = e.excludeSet_.begin(); i != e.excludeSet_.end(); ++i) {
122 >        o << "exclude[" << index << "] i, j: " << (*i).first << " - "
123 >            << (*i).second << "\n";
124 >        index++;
125 >    }
126 >
127 >    return o;
128   }
129  
99 int Exclude::getSize() {
100  return excludeSet.size();
130   }
131 +
132 +  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines