[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension BON2Component.cpp,1.17,1.18

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

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension
In directory braindrain:/tmp/cvs-serv19479/BonExtension

Modified Files:
	BON2Component.cpp 
Log Message:
Syncing with MetaInterpreter.


CVS User: zolmol

Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** BON2Component.cpp	16 Jul 2004 22:39:06 -0000	1.17
--- BON2Component.cpp	30 Jul 2004 00:37:49 -0000	1.18
***************
*** 543,551 ****
  			rel_it->getOperation() == Relation::EQUIVALENCE_OP)
  		{
! 			std::string n1 = rel_it->getOp1()->getName();
  			std::string n2 = rel_it->getOp2()->getName();
  			if ( n1 == n2 ) // the names are the same no selection needed
  			{ }
! 			else
  			{
  				bool is_proxy_first = isProxy( rel_it->getOp1()) == 1;
--- 543,551 ----
  			rel_it->getOperation() == Relation::EQUIVALENCE_OP)
  		{
! 			/*std::string n1 = rel_it->getOp1()->getName();
  			std::string n2 = rel_it->getOp2()->getName();
  			if ( n1 == n2 ) // the names are the same no selection needed
  			{ }
! 			else*/
  			{
  				bool is_proxy_first = isProxy( rel_it->getOp1()) == 1;
***************
*** 656,664 ****
  		{ // 
  			ObjPointer obj1 = rel_it->getOp1(), obj2 = rel_it->getOp2();
  			
! 			// obj1 will have obj2 and proxies of obj2 as its alter egos
! 			insertIntoEquivBag( obj2, obj1);
! 			operandSearchAndReplace( obj2, obj1); //"Right law": repl left (op2) with right(op1)
! 			
  			rel_it = m_equivRelations.erase( rel_it); // <- relies on that erase increments rel_it
  
--- 656,668 ----
  		{ // 
  			ObjPointer obj1 = rel_it->getOp1(), obj2 = rel_it->getOp2();
+ 
  			
! 			if( obj1 != obj2) //avoid trivial case: "A equiv A"
! 			{
! 				// obj1 will have obj2 and proxies of obj2 as its alter egos
! 				insertIntoEquivBag( obj2, obj1);
! 				operandSearchAndReplace( obj2, obj1); //"Right law": repl left (op2) with right(op1)
! 			}			
! 
  			rel_it = m_equivRelations.erase( rel_it); // <- relies on that erase increments rel_it
  
***************
*** 962,978 ****
  			new_elem = 0;
  			if ( obj->getObjectMeta().name() == "FCO" )
! 				new_elem = m_sheet->createFcoRep( fco);
  			else if ( obj->getObjectMeta().name() == "Atom" )
! 				new_elem = m_sheet->createAtomRep( fco);
  			else if ( obj->getObjectMeta().name() == "Model" )
! 				new_elem = m_sheet->createModelRep( fco);
  			else if ( obj->getObjectMeta().name() == "Connection" )
! 				new_elem = m_sheet->createConnectionRep( fco);
  			else if ( obj->getObjectMeta().name() == "Set" )
! 				new_elem = m_sheet->createSetRep( fco);
  			else if ( obj->getObjectMeta().name() == "Reference" )
! 				new_elem = m_sheet->createReferenceRep( fco);
  			else if ( obj->getObjectMeta().name() == "Folder" )
! 				new_elem = m_sheet->createFolderRep( fco, (resp != BON::FCO())?resp:fco);
  			else if ( obj->getObjectMeta().name() == "Aspect" )
  				/*new_elem = m_sheet->createAspectRep( fco, (resp != BON::FCO())?resp:fco)*/;
--- 966,982 ----
  			new_elem = 0;
  			if ( obj->getObjectMeta().name() == "FCO" )
! 				new_elem = m_sheet->createFcoRep( fco, resp);
  			else if ( obj->getObjectMeta().name() == "Atom" )
! 				new_elem = m_sheet->createAtomRep( fco, resp);
  			else if ( obj->getObjectMeta().name() == "Model" )
! 				new_elem = m_sheet->createModelRep( fco, resp);
  			else if ( obj->getObjectMeta().name() == "Connection" )
! 				new_elem = m_sheet->createConnectionRep( fco, resp);
  			else if ( obj->getObjectMeta().name() == "Set" )
! 				new_elem = m_sheet->createSetRep( fco, resp);
  			else if ( obj->getObjectMeta().name() == "Reference" )
! 				new_elem = m_sheet->createReferenceRep( fco, resp);
  			else if ( obj->getObjectMeta().name() == "Folder" )
! 				new_elem = m_sheet->createFolderRep( fco, resp);//(resp != BON::FCO())?resp:fco);
  			else if ( obj->getObjectMeta().name() == "Aspect" )
  				/*new_elem = m_sheet->createAspectRep( fco, (resp != BON::FCO())?resp:fco)*/;