[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension/Rep ConnJoint.cpp,1.5,1.6 FCO.cpp,1.8,1.9 ReferenceRep.cpp,1.5,1.6

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

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

Modified Files:
	ConnJoint.cpp FCO.cpp ReferenceRep.cpp 
Log Message:
TransitiveReference allowed.


CVS User: zolmol

Index: ConnJoint.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/ConnJoint.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConnJoint.cpp	10 Mar 2004 02:50:18 -0000	1.5
--- ConnJoint.cpp	10 Mar 2004 20:03:32 -0000	1.6
***************
*** 283,287 ****
  									}
  									// take a look on the references to sub_model
! 									const FCO::ReferenceRepList &ref_list = sub_model->getFinalReferences();//<!> getTransitiveReferencesToMe(); //references may point to submodel
  									FCO::ReferenceRepList_ConstIterator ref_it = ref_list.begin();
  									for( ; ref_it != ref_list.end(); ++ref_it)
--- 283,287 ----
  									}
  									// take a look on the references to sub_model
! 									const FCO::ReferenceRepList &ref_list = sub_model->getTransitiveReferencesToMe(); //references may point to submodel
  									FCO::ReferenceRepList_ConstIterator ref_it = ref_list.begin();
  									for( ; ref_it != ref_list.end(); ++ref_it)

Index: FCO.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FCO.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FCO.cpp	10 Mar 2004 17:42:16 -0000	1.8
--- FCO.cpp	10 Mar 2004 20:03:32 -0000	1.9
***************
*** 205,211 ****
  
  /*
! dealing with the case when R1->R2->R3->M. They all have similar aspects
! ->currently GME doesn't support this, though it shows in a way it could support!!!
! <!>
  */
  FCO::ReferenceRepList FCO::getTransitiveReferencesToMe() const
--- 205,211 ----
  
  /*
! Dealing with the case when R1->R2->R3->M. 
! They all have similar aspects, and connecting is allowed through these.
! Previously named getAllMyReferences
  */
  FCO::ReferenceRepList FCO::getTransitiveReferencesToMe() const

Index: ReferenceRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/ReferenceRep.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ReferenceRep.cpp	10 Mar 2004 02:50:18 -0000	1.5
--- ReferenceRep.cpp	10 Mar 2004 20:03:32 -0000	1.6
***************
*** 181,188 ****
  bool ReferenceRep::finalize()
  {
- 	m_allReferees = m_finalReferees;
- 	return true; //<!>
- 	// right now do not perform the calc
- 
  	bool value_set = false;
  	bool same_kind = true;
--- 181,184 ----