[GME-commit] GMESRC/SDK/BON BONImpl.cpp,1.15,1.16

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/SDK/BON
In directory braindrain:/tmp/cvs-serv5648

Modified Files:
	BONImpl.cpp 
Log Message:
Aspect related bug corrected.


CVS User: zolmol

Index: BONImpl.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/SDK/BON/BONImpl.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** BONImpl.cpp	29 Apr 2004 18:22:35 -0000	1.15
--- BONImpl.cpp	6 May 2004 15:57:51 -0000	1.16
***************
*** 24,27 ****
--- 24,29 ----
  #include <ComponentConfig.h>
  
+ #define TEST_META_CONFORMANCE_INSIDE_BON // by ZolMol
+ 
  namespace BON
  {
***************
*** 2295,2299 ****
  				std::multiset<ConnectionEnd>::iterator itSaved = itce;
  				itce++;
! 				if ( ! (*itSaved)->getFCOHelper()->isVisible( meta, true ) )
  					setResult.erase( itSaved );
  			}
--- 2297,2301 ----
  				std::multiset<ConnectionEnd>::iterator itSaved = itce;
  				itce++;
! 				if ( ! (*itSaved)->getFCOHelper()->isVisible( aspect, true ) ) // changed meta->aspect by ZolMol
  					setResult.erase( itSaved );
  			}
***************
*** 2358,2362 ****
  				std::multiset<ConnectionEnd>::iterator itSaved = itce;
  				itce++;
! 				if ( ! (*itSaved)->getFCOHelper()->isVisible( meta, true ) )
  					setResult.erase( itSaved );
  			}
--- 2360,2364 ----
  				std::multiset<ConnectionEnd>::iterator itSaved = itce;
  				itce++;
! 				if ( ! (*itSaved)->getFCOHelper()->isVisible( aspect, true ) ) // changed meta->aspect by ZolMol
  					setResult.erase( itSaved );
  			}
***************
*** 2492,2496 ****
  				std::multiset<ConnectionEnd>::iterator itSaved = itce;
  				itce++;
! 				if ( ! (*itSaved)->getFCOHelper()->isVisible( meta, true ) )
  					setResult.erase( itSaved );
  			}
--- 2494,2498 ----
  				std::multiset<ConnectionEnd>::iterator itSaved = itce;
  				itce++;
! 				if ( ! (*itSaved)->getFCOHelper()->isVisible( aspect, true ) ) // change meta->aspect by ZolMol
  					setResult.erase( itSaved );
  			}
***************
*** 5684,5688 ****
  			mapRefSeqs[ it->first ] = FCOsPtr();
  			//<!> ZolMol remove upon working with new GME //t //temporary line
! 			// COMTHROW( mapRefSeqs[ it->first ].CoCreateInstance( L"Mga.MgaFCOs"));
  			if ( it->second->isReferencePort() ) {
  				ReferencePort port( it->second );
--- 5686,5690 ----
  			mapRefSeqs[ it->first ] = FCOsPtr();
  			//<!> ZolMol remove upon working with new GME //t //temporary line
! 			//COMTHROW( mapRefSeqs[ it->first ].CoCreateInstance( L"Mga.MgaFCOs"));
  			if ( it->second->isReferencePort() ) {
  				ReferencePort port( it->second );
***************
*** 5712,5732 ****
  			bOK = true;
  			roles = MON::Connection( meta.child() ).specification( i ).roles();
! 			for ( itR = roles.begin() ; itR != roles.end() ; itR++ ) 
! 			{
! #ifndef BON_DEBUG_VERSION
  				if ( ! itR->isTarget( mapEnds[ itR->name() ]->getRole() ) ) {
  					bOK = false;
  					break;
  				}
- #else
- 				std::string rn = itR->name();
- 				FCO me = mapEnds[ rn ];
- 				MON::Containment ct = me->getRole();
- 				bool found = itR->isTarget( ct );
- 				if ( ! found ) {
- 					bOK = false;
- 					break;
- 				}
- #endif
  			}
  		}
--- 5714,5722 ----
  			bOK = true;
  			roles = MON::Connection( meta.child() ).specification( i ).roles();
! 			for ( itR = roles.begin() ; itR != roles.end() ; itR++ ) {
  				if ( ! itR->isTarget( mapEnds[ itR->name() ]->getRole() ) ) {
  					bOK = false;
  					break;
  				}
  			}
  		}