ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libBASS/MoleculeStamp.cpp
(Generate patch)

Comparing trunk/OOPSE/libBASS/MoleculeStamp.cpp (file contents):
Revision 1256 by gezelter, Thu Jun 10 14:59:14 2004 UTC vs.
Revision 1268 by tim, Fri Jun 11 17:16:21 2004 UTC

# Line 308 | Line 308 | char* MoleculeStamp::addRigidBody( RigidBodyStamp* the
308   char* MoleculeStamp::addRigidBody( RigidBodyStamp* the_rigidbody,
309                                     int rigidBodyIndex ){
310    
311
312  printf("rigidBodyIndex = %d\n", rigidBodyIndex);
311    if( have_rigidbodies && rigidBodyIndex < n_rigidbodies )
312      rigidBodies[rigidBodyIndex] = the_rigidbody;
313    else {
# Line 466 | Line 464 | bool MoleculeStamp::isBondInSameRigidBody(BondStamp* b
464    int consAtomA;
465    int consAtomB;
466  
467 <  return isAtomInRigidBody(bond->getA(),rbA, consAtomA) &&
468 <                isAtomInRigidBody(bond->getB(),rbB, consAtomB);
467 >  if (!isAtomInRigidBody(bond->getA(),rbA, consAtomA))
468 >    return false;
469 >
470 >  if(!isAtomInRigidBody(bond->getB(),rbB, consAtomB) )
471 >    return false;
472 >
473 >  if(rbB == rbA)
474 >    return true;
475 >  else
476 >    return false;
477   }
478  
479  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines