ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/visitors/AtomVisitor.cpp
(Generate patch)

Comparing trunk/src/visitors/AtomVisitor.cpp (file contents):
Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 881 by xsun, Thu Feb 2 15:49:42 2006 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 42 | Line 42
42   #include <cstring>
43   #include "visitors/AtomVisitor.hpp"
44   #include "primitives/DirectionalAtom.hpp"
45 #include "math/MatVec3.h"
45   #include "primitives/RigidBody.hpp"
46  
47   namespace oopse {
48 < void BaseAtomVisitor::visit(RigidBody *rb) {
49 < //vector<Atom*> myAtoms;
50 < //vector<Atom*>::iterator atomIter;
48 >  void BaseAtomVisitor::visit(RigidBody *rb) {
49 >    //vector<Atom*> myAtoms;
50 >    //vector<Atom*>::iterator atomIter;
51  
52 < //myAtoms = rb->getAtoms();
52 >    //myAtoms = rb->getAtoms();
53  
54 < //for(atomIter = myAtoms.begin(); atomIter != myAtoms.end(); ++atomIter)
55 < //  (*atomIter)->accept(this);
56 <    }
54 >    //for(atomIter = myAtoms.begin(); atomIter != myAtoms.end(); ++atomIter)
55 >    //  (*atomIter)->accept(this);
56 >  }
57  
58 < void BaseAtomVisitor::setVisited(Atom *atom) {
58 >  void BaseAtomVisitor::setVisited(Atom *atom) {
59      GenericData *data;
60      data = atom->getPropertyByName("VISITED");
61  
62      //if visited property is not existed, add it as new property
63      if (data == NULL) {
64 <        data = new GenericData();
65 <        data->setID("VISITED");
66 <        atom->addProperty(data);
64 >      data = new GenericData();
65 >      data->setID("VISITED");
66 >      atom->addProperty(data);
67      }
68 < }
68 >  }
69  
70 < bool BaseAtomVisitor::isVisited(Atom *atom) {
70 >  bool BaseAtomVisitor::isVisited(Atom *atom) {
71      GenericData *data;
72      data = atom->getPropertyByName("VISITED");
73      return data == NULL ? false : true;
74 < }
74 >  }
75  
76 < bool SSDAtomVisitor::isSSDAtom(const std::string&atomType) {
77 <    std::vector<std::string>::iterator strIter;
76 >  bool SSDAtomVisitor::isSSDAtom(const std::string&atomType) {
77 >    std::set<std::string>::iterator strIter;
78 >    strIter = ssdAtomType.find(atomType);
79 >    return strIter != ssdAtomType.end() ? true : false;
80 >  }
81  
82 <    for( strIter = ssdAtomType.begin(); strIter != ssdAtomType.end();
83 <        ++strIter )
82 <  if (*strIter == atomType)
83 <      return true;
82 >  void SSDAtomVisitor::visit(DirectionalAtom *datom) {
83 >    std::vector<AtomInfo*>atoms;
84  
85    return false;
86 }
87
88 void SSDAtomVisitor::visit(DirectionalAtom *datom) {
89    std::vector<AtomInfo *>atoms;
90
85      //we need to convert SSD into 4 differnet atoms
86      //one oxygen atom, two hydrogen atoms and one pseudo atom which is the center of the mass
87      //of the water with a dipole moment
# Line 107 | Line 101 | void SSDAtomVisitor::visit(DirectionalAtom *datom) {
101  
102      //if atom is not SSD atom, just skip it
103      if (!isSSDAtom(datom->getType()))
104 <        return;
104 >      return;
105  
106      data = datom->getPropertyByName("ATOMDATA");
107  
108      if (data != NULL) {
109 <        atomData = dynamic_cast<AtomData *>(data);
109 >      atomData = dynamic_cast<AtomData *>(data);
110  
111 <        if (atomData == NULL) {
112 <            std::cerr << "can not get Atom Data from " << datom->getType() << std::endl;
113 <            atomData = new AtomData;
114 <            haveAtomData = false;
115 <        } else
116 <            haveAtomData = true;
111 >      if (atomData == NULL) {
112 >        std::cerr << "can not get Atom Data from " << datom->getType() << std::endl;
113 >        atomData = new AtomData;
114 >        haveAtomData = false;
115 >      } else
116 >        haveAtomData = true;
117      } else {
118 <        atomData = new AtomData;
119 <        haveAtomData = false;
118 >      atomData = new AtomData;
119 >      haveAtomData = false;
120      }
121  
122      pos = datom->getPos();
# Line 138 | Line 132 | void SSDAtomVisitor::visit(DirectionalAtom *datom) {
132      newVec = rotTrans * u;
133  
134      atomInfo = new AtomInfo;
135 <    atomInfo->AtomType = "X";
135 >    atomInfo->atomTypeName = "X";
136      atomInfo->pos[0] = pos[0];
137      atomInfo->pos[1] = pos[1];
138      atomInfo->pos[2] = pos[2];
# Line 153 | Line 147 | void SSDAtomVisitor::visit(DirectionalAtom *datom) {
147      newVec = rotTrans * ox;
148  
149      atomInfo = new AtomInfo;
150 <    atomInfo->AtomType = "O";
150 >    atomInfo->atomTypeName = "O";
151      atomInfo->pos[0] = pos[0] + newVec[0];
152      atomInfo->pos[1] = pos[1] + newVec[1];
153      atomInfo->pos[2] = pos[2] + newVec[2];
# Line 166 | Line 160 | void SSDAtomVisitor::visit(DirectionalAtom *datom) {
160      //matVecMul3(rotTrans, h1, newVec);
161      newVec = rotTrans * h1;
162      atomInfo = new AtomInfo;
163 <    atomInfo->AtomType = "H";
163 >    atomInfo->atomTypeName = "H";
164      atomInfo->pos[0] = pos[0] + newVec[0];
165      atomInfo->pos[1] = pos[1] + newVec[1];
166      atomInfo->pos[2] = pos[2] + newVec[2];
# Line 179 | Line 173 | void SSDAtomVisitor::visit(DirectionalAtom *datom) {
173      //matVecMul3(rotTrans, h2, newVec);
174      newVec = rotTrans * h2;
175      atomInfo = new AtomInfo;
176 <    atomInfo->AtomType = "H";
176 >    atomInfo->atomTypeName = "H";
177      atomInfo->pos[0] = pos[0] + newVec[0];
178      atomInfo->pos[1] = pos[1] + newVec[1];
179      atomInfo->pos[2] = pos[2] + newVec[2];
# Line 191 | Line 185 | void SSDAtomVisitor::visit(DirectionalAtom *datom) {
185      //add atom data into atom's property
186  
187      if (!haveAtomData) {
188 <        atomData->setID("ATOMDATA");
189 <        datom->addProperty(atomData);
188 >      atomData->setID("ATOMDATA");
189 >      datom->addProperty(atomData);
190      }
191  
192      setVisited(datom);
193 < }
193 >  }
194  
195 < const std::string SSDAtomVisitor::toString() {
195 >  const std::string SSDAtomVisitor::toString() {
196      char   buffer[65535];
197      std::string result;
198  
# Line 218 | Line 212 | const std::string SSDAtomVisitor::toString() {
212      result += buffer;
213  
214      return result;
215 < }
215 >  }
216  
217 < bool LinearAtomVisitor::isLinearAtom(const string& atomType){
218 <  vector<string>::iterator strIter;
219 <  
226 <  for(strIter = linearAtomType.begin(); strIter != linearAtomType.end();
227 <      ++strIter)
228 <    if(*strIter == atomType)
229 <      return true;
230 <  
231 <  return false;  
232 < }
217 >  bool LinearAtomVisitor::isLinearAtom(const std::string& atomType){
218 >    std::set<std::string>::iterator strIter;
219 >    strIter = linearAtomType.find(atomType);
220  
221 < void LinearAtomVisitor::visit(DirectionalAtom* datom){
221 >    return strIter != linearAtomType.end() ? true : false;
222 >  }
223  
224 <  vector<AtomInfo*> atoms;
224 >  void LinearAtomVisitor::visit(DirectionalAtom* datom){
225 >    std::vector<AtomInfo*> atoms;
226 >    //we need to convert linear into 4 different atoms
227 >    Vector3d c1(0.0, 0.0, -1.8);
228 >    Vector3d c2(0.0, 0.0, -0.6);
229 >    Vector3d c3(0.0, 0.0,  0.6);
230 >    Vector3d c4(0.0, 0.0,  1.8);
231 >    RotMat3x3d rotMatrix;
232 >    RotMat3x3d rotTrans;
233 >    AtomInfo* atomInfo;
234 >    Vector3d pos;
235 >    Vector3d newVec;
236 >    Quat4d q;
237 >    AtomData* atomData;
238 >    GenericData* data;
239 >    bool haveAtomData;
240  
241 <  //we need to convert linear into 4 different atoms
242 <  double c1[3] = {0.0, 0.0, -1.8};
243 <  double c2[3] = {0.0, 0.0, -0.6};
241 <  double c3[3] = {0.0, 0.0,  0.6};
242 <  double c4[3] = {0.0, 0.0,  1.8};
243 <  double rotMatrix[3][3];
244 <  double rotTrans[3][3];
245 <  AtomInfo* atomInfo;
246 <  double pos[3];
247 <  double newVec[3];
248 <  double q[4];
249 <  AtomData* atomData;
250 <  GenericData* data;
251 <  bool haveAtomData;
252 <  
253 <  //if atom is not SSD atom, just skip it
254 <  if(!isLinearAtom(datom->getType()))
255 <    return;
256 <  
257 <  data = datom->getProperty("ATOMDATA");
258 <  if(data != NULL){
241 >    //if atom is not SSD atom, just skip it
242 >    if(!isLinearAtom(datom->getType()))
243 >      return;
244  
245 <    atomData = dynamic_cast<AtomData*>(data);  
246 <    if(atomData == NULL){
247 <      cerr << "can not get Atom Data from " << datom->getType() << endl;
248 <      atomData = new AtomData;
249 <      haveAtomData = false;      
245 >    data = datom->getPropertyByName("ATOMDATA");
246 >    if(data != NULL){
247 >      atomData = dynamic_cast<AtomData*>(data);  
248 >      if(atomData == NULL){
249 >        std::cerr << "can not get Atom Data from " << datom->getType() << std::endl;
250 >        atomData = new AtomData;
251 >        haveAtomData = false;      
252 >      } else {
253 >        haveAtomData = true;
254 >      }
255 >    } else {
256 >      atomData = new AtomData;
257 >      haveAtomData = false;
258      }
266    else
267      haveAtomData = true;
268  }
269  else{
270    atomData = new AtomData;
271    haveAtomData = false;
272  }
259    
260    
261 <  datom->getPos(pos);
262 <  datom->getQ(q);
263 <  datom->getA(rotMatrix);
261 >    pos = datom->getPos();
262 >    q = datom->getQ();
263 >    rotMatrix = datom->getA();
264  
265 <  // We need A^T to convert from body-fixed to space-fixed:
266 <  transposeMat3(rotMatrix, rotTrans);
281 <  
282 <  matVecMul3(rotTrans, c1, newVec);
283 <  atomInfo = new AtomInfo;
284 <  atomInfo->AtomType = "C";
285 <  atomInfo->pos[0] = pos[0] + newVec[0];
286 <  atomInfo->pos[1] = pos[1] + newVec[1];
287 <  atomInfo->pos[2] = pos[2] + newVec[2];
288 <  atomInfo->dipole[0] = 0.0;
289 <  atomInfo->dipole[1] = 0.0;
290 <  atomInfo->dipole[2] = 0.0;
291 <  atomData->addAtomInfo(atomInfo);
265 >    // We need A^T to convert from body-fixed to space-fixed:  
266 >    rotTrans = rotMatrix.transpose();
267  
268 <  matVecMul3(rotTrans, c2, newVec);
269 <  atomInfo = new AtomInfo;
270 <  atomInfo->AtomType = "C";
271 <  atomInfo->pos[0] = pos[0] + newVec[0];
272 <  atomInfo->pos[1] = pos[1] + newVec[1];
273 <  atomInfo->pos[2] = pos[2] + newVec[2];
274 <  atomInfo->dipole[0] = 0.0;
275 <  atomInfo->dipole[1] = 0.0;
276 <  atomInfo->dipole[2] = 0.0;
277 <  atomData->addAtomInfo(atomInfo);
268 >    newVec = rotTrans * c1;
269 >    atomInfo = new AtomInfo;
270 >    atomInfo->atomTypeName = "C";
271 >    atomInfo->pos[0] = pos[0] + newVec[0];
272 >    atomInfo->pos[1] = pos[1] + newVec[1];
273 >    atomInfo->pos[2] = pos[2] + newVec[2];
274 >    atomInfo->dipole[0] = 0.0;
275 >    atomInfo->dipole[1] = 0.0;
276 >    atomInfo->dipole[2] = 0.0;
277 >    atomData->addAtomInfo(atomInfo);
278  
279 <  matVecMul3(rotTrans, c3, newVec);
280 <  atomInfo = new AtomInfo;
281 <  atomInfo->AtomType = "C";
282 <  atomInfo->pos[0] = pos[0] + newVec[0];
283 <  atomInfo->pos[1] = pos[1] + newVec[1];
284 <  atomInfo->pos[2] = pos[2] + newVec[2];
285 <  atomInfo->dipole[0] = 0.0;
286 <  atomInfo->dipole[1] = 0.0;
287 <  atomInfo->dipole[2] = 0.0;
288 <  atomData->addAtomInfo(atomInfo);
314 <
315 <  matVecMul3(rotTrans, c4, newVec);
316 <  atomInfo = new AtomInfo;
317 <  atomInfo->AtomType = "C";
318 <  atomInfo->pos[0] = pos[0] + newVec[0];
319 <  atomInfo->pos[1] = pos[1] + newVec[1];
320 <  atomInfo->pos[2] = pos[2] + newVec[2];
321 <  atomInfo->dipole[0] = 0.0;
322 <  atomInfo->dipole[1] = 0.0;
323 <  atomInfo->dipole[2] = 0.0;
324 <  atomData->addAtomInfo(atomInfo);
325 <
326 <  //add atom data into atom's property
279 >    newVec = rotTrans * c2;
280 >    atomInfo = new AtomInfo;
281 >    atomInfo->atomTypeName = "C";
282 >    atomInfo->pos[0] = pos[0] + newVec[0];
283 >    atomInfo->pos[1] = pos[1] + newVec[1];
284 >    atomInfo->pos[2] = pos[2] + newVec[2];
285 >    atomInfo->dipole[0] = 0.0;
286 >    atomInfo->dipole[1] = 0.0;
287 >    atomInfo->dipole[2] = 0.0;
288 >    atomData->addAtomInfo(atomInfo);
289  
290 <  if(!haveAtomData){
291 <    atomData->setID("ATOMDATA");
292 <    datom->addProperty(atomData);
290 >    newVec = rotTrans * c3;
291 >    atomInfo = new AtomInfo;
292 >    atomInfo->atomTypeName = "C";
293 >    atomInfo->pos[0] = pos[0] + newVec[0];
294 >    atomInfo->pos[1] = pos[1] + newVec[1];
295 >    atomInfo->pos[2] = pos[2] + newVec[2];
296 >    atomInfo->dipole[0] = 0.0;
297 >    atomInfo->dipole[1] = 0.0;
298 >    atomInfo->dipole[2] = 0.0;
299 >    atomData->addAtomInfo(atomInfo);
300 >
301 >    newVec = rotTrans * c4;
302 >    atomInfo = new AtomInfo;
303 >    atomInfo->atomTypeName = "C";
304 >    atomInfo->pos[0] = pos[0] + newVec[0];
305 >    atomInfo->pos[1] = pos[1] + newVec[1];
306 >    atomInfo->pos[2] = pos[2] + newVec[2];
307 >    atomInfo->dipole[0] = 0.0;
308 >    atomInfo->dipole[1] = 0.0;
309 >    atomInfo->dipole[2] = 0.0;
310 >    atomData->addAtomInfo(atomInfo);
311 >
312 >    //add atom data into atom's property
313 >
314 >    if(!haveAtomData){
315 >      atomData->setID("ATOMDATA");
316 >      datom->addProperty(atomData);
317 >    }
318 >
319 >    setVisited(datom);
320 >
321    }
322  
323 <  setVisited(datom);
323 >  const std::string LinearAtomVisitor::toString(){
324 >    char buffer[65535];
325 >    std::string result;
326 >  
327 >    sprintf(buffer ,"------------------------------------------------------------------\n");
328 >    result += buffer;
329  
330 < }
330 >    sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
331 >    result += buffer;
332  
333 < const string LinearAtomVisitor::toString(){
334 <  char buffer[65535];
335 <  string result;
333 >    sprintf(buffer , "Visitor Description: Convert linear into 4 different atoms\n");
334 >    result += buffer;
335 >
336 >    sprintf(buffer ,"------------------------------------------------------------------\n");
337 >    result += buffer;
338 >
339 >    return result;
340 >  }
341 >
342 >  bool GBLipidAtomVisitor::isGBLipidAtom(const std::string& atomType){
343 >    std::set<std::string>::iterator strIter;
344 >    strIter = GBLipidAtomType.find(atomType);
345 >
346 >    return strIter != GBLipidAtomType.end() ? true : false;
347 >  }
348 >
349 >  void GBLipidAtomVisitor::visit(DirectionalAtom* datom){
350 >    std::vector<AtomInfo*> atoms;
351 >    //we need to convert linear into 4 different atoms
352 >    Vector3d c1(0.0, 0.0, -6.25);
353 >    Vector3d c2(0.0, 0.0, -2.1);
354 >    Vector3d c3(0.0, 0.0,  2.1);
355 >    Vector3d c4(0.0, 0.0,  6.25);
356 >    RotMat3x3d rotMatrix;
357 >    RotMat3x3d rotTrans;
358 >    AtomInfo* atomInfo;
359 >    Vector3d pos;
360 >    Vector3d newVec;
361 >    Quat4d q;
362 >    AtomData* atomData;
363 >    GenericData* data;
364 >    bool haveAtomData;
365 >
366 >    //if atom is not GBlipid atom, just skip it
367 >    if(!isGBLipidAtom(datom->getType()))
368 >      return;
369 >
370 >    data = datom->getPropertyByName("ATOMDATA");
371 >    if(data != NULL){
372 >      atomData = dynamic_cast<AtomData*>(data);  
373 >      if(atomData == NULL){
374 >        std::cerr << "can not get Atom Data from " << datom->getType() << std::endl;
375 >        atomData = new AtomData;
376 >        haveAtomData = false;      
377 >      } else {
378 >        haveAtomData = true;
379 >      }
380 >    } else {
381 >      atomData = new AtomData;
382 >      haveAtomData = false;
383 >    }
384 >  
385    
386 <  sprintf(buffer ,"------------------------------------------------------------------\n");
387 <  result += buffer;
386 >    pos = datom->getPos();
387 >    q = datom->getQ();
388 >    rotMatrix = datom->getA();
389  
390 <  sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
391 <  result += buffer;
390 >    // We need A^T to convert from body-fixed to space-fixed:  
391 >    rotTrans = rotMatrix.transpose();
392  
393 <  sprintf(buffer , "Visitor Description: Convert linear into 4 different atoms\n");
394 <  result += buffer;
393 >    newVec = rotTrans * c1;
394 >    atomInfo = new AtomInfo;
395 >    atomInfo->atomTypeName = "K";
396 >    atomInfo->pos[0] = pos[0] + newVec[0];
397 >    atomInfo->pos[1] = pos[1] + newVec[1];
398 >    atomInfo->pos[2] = pos[2] + newVec[2];
399 >    atomInfo->dipole[0] = 0.0;
400 >    atomInfo->dipole[1] = 0.0;
401 >    atomInfo->dipole[2] = 0.0;
402 >    atomData->addAtomInfo(atomInfo);
403  
404 <  sprintf(buffer ,"------------------------------------------------------------------\n");
405 <  result += buffer;
404 >    newVec = rotTrans * c2;
405 >    atomInfo = new AtomInfo;
406 >    atomInfo->atomTypeName = "K";
407 >    atomInfo->pos[0] = pos[0] + newVec[0];
408 >    atomInfo->pos[1] = pos[1] + newVec[1];
409 >    atomInfo->pos[2] = pos[2] + newVec[2];
410 >    atomInfo->dipole[0] = 0.0;
411 >    atomInfo->dipole[1] = 0.0;
412 >    atomInfo->dipole[2] = 0.0;
413 >    atomData->addAtomInfo(atomInfo);
414  
415 <  return result;
416 < }
415 >    newVec = rotTrans * c3;
416 >    atomInfo = new AtomInfo;
417 >    atomInfo->atomTypeName = "K";
418 >    atomInfo->pos[0] = pos[0] + newVec[0];
419 >    atomInfo->pos[1] = pos[1] + newVec[1];
420 >    atomInfo->pos[2] = pos[2] + newVec[2];
421 >    atomInfo->dipole[0] = 0.0;
422 >    atomInfo->dipole[1] = 0.0;
423 >    atomInfo->dipole[2] = 0.0;
424 >    atomData->addAtomInfo(atomInfo);
425  
426 < //----------------------------------------------------------------------------//
426 >    newVec = rotTrans * c4;
427 >    atomInfo = new AtomInfo;
428 >    atomInfo->atomTypeName = "K";
429 >    atomInfo->pos[0] = pos[0] + newVec[0];
430 >    atomInfo->pos[1] = pos[1] + newVec[1];
431 >    atomInfo->pos[2] = pos[2] + newVec[2];
432 >    atomInfo->dipole[0] = 0.0;
433 >    atomInfo->dipole[1] = 0.0;
434 >    atomInfo->dipole[2] = 0.0;
435 >    atomData->addAtomInfo(atomInfo);
436  
437 < void DefaultAtomVisitor::visit(Atom *atom) {
437 >    //add atom data into atom's property
438 >
439 >    if(!haveAtomData){
440 >      atomData->setID("ATOMDATA");
441 >      datom->addProperty(atomData);
442 >    }
443 >
444 >    setVisited(datom);
445 >
446 >  }
447 >
448 >  const std::string GBLipidAtomVisitor::toString(){
449 >    char buffer[65535];
450 >    std::string result;
451 >  
452 >    sprintf(buffer ,"------------------------------------------------------------------\n");
453 >    result += buffer;
454 >
455 >    sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
456 >    result += buffer;
457 >
458 >    sprintf(buffer , "Visitor Description: Convert GBlipid into 4 different K atoms\n");
459 >    result += buffer;
460 >
461 >    sprintf(buffer ,"------------------------------------------------------------------\n");
462 >    result += buffer;
463 >
464 >    return result;
465 >  }
466 >
467 >  //----------------------------------------------------------------------------//
468 >
469 >  void DefaultAtomVisitor::visit(Atom *atom) {
470      AtomData *atomData;
471      AtomInfo *atomInfo;
472      Vector3d  pos;
473  
474      if (isVisited(atom))
475 <        return;
475 >      return;
476  
477      atomInfo = new AtomInfo;
478  
# Line 369 | Line 480 | void DefaultAtomVisitor::visit(Atom *atom) {
480      atomData->setID("ATOMDATA");
481  
482      pos = atom->getPos();
483 <    atomInfo->AtomType = atom->getType();
483 >    atomInfo->atomTypeName = atom->getType();
484      atomInfo->pos[0] = pos[0];
485      atomInfo->pos[1] = pos[1];
486      atomInfo->pos[2] = pos[2];
# Line 382 | Line 493 | void DefaultAtomVisitor::visit(Atom *atom) {
493      atom->addProperty(atomData);
494  
495      setVisited(atom);
496 < }
496 >  }
497  
498 < void DefaultAtomVisitor::visit(DirectionalAtom *datom) {
498 >  void DefaultAtomVisitor::visit(DirectionalAtom *datom) {
499      AtomData *atomData;
500      AtomInfo *atomInfo;
501      Vector3d  pos;
502      Vector3d  u;
503  
504      if (isVisited(datom))
505 <        return;
505 >      return;
506  
507      pos = datom->getPos();
508 <    u = datom->getElectroFrame().getColumn(3);
508 >    u = datom->getElectroFrame().getColumn(2);
509  
510      atomData = new AtomData;
511      atomData->setID("ATOMDATA");
512      atomInfo = new AtomInfo;
513  
514 <    atomInfo->AtomType = datom->getType();
514 >    atomInfo->atomTypeName = datom->getType();
515      atomInfo->pos[0] = pos[0];
516      atomInfo->pos[1] = pos[1];
517      atomInfo->pos[2] = pos[2];
# Line 413 | Line 524 | void DefaultAtomVisitor::visit(DirectionalAtom *datom)
524      datom->addProperty(atomData);
525  
526      setVisited(datom);
527 < }
527 >  }
528  
529 < const std::string DefaultAtomVisitor::toString() {
529 >  const std::string DefaultAtomVisitor::toString() {
530      char   buffer[65535];
531      std::string result;
532  
# Line 435 | Line 546 | const std::string DefaultAtomVisitor::toString() {
546      result += buffer;
547  
548      return result;
549 < }
549 >  }
550   } //namespace oopse

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines