[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep ConnJoint.cpp,1.6,1.7 FCO.cpp,1.7,1.8 ReferenceRep.cpp,1.7,1.8

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

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
In directory braindrain:/tmp/cvs-serv1726/MetaInterpreter2004/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/MetaInterpreter2004/Rep/ConnJoint.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ConnJoint.cpp	10 Mar 2004 02:36:28 -0000	1.6
--- ConnJoint.cpp	10 Mar 2004 20:03:32 -0000	1.7
***************
*** 234,238 ****
  									}
  									// take a look on the references to sub_model
! 									const FCO::ReferenceRepList &ref_list = sub_model->getFinalReferences();//<!> use if getTransitiveReferencesToMe(); if you allow conns for transitive references //references may point to submodel
  									FCO::ReferenceRepList_ConstIterator ref_it = ref_list.begin();
  									for( ; ref_it != ref_list.end(); ++ref_it)
--- 234,238 ----
  									}
  									// take a look on the references to sub_model
! 									const FCO::ReferenceRepList &ref_list = sub_model->getTransitiveReferencesToMe(); //if you allow conns for transitive references //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/MetaInterpreter2004/Rep/FCO.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FCO.cpp	10 Mar 2004 02:36:29 -0000	1.7
--- FCO.cpp	10 Mar 2004 20:03:32 -0000	1.8
***************
*** 187,195 ****
  
  /*
! 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!!!
! <!>
! 		it should have a name like: getTransitiveReferencesToMe // <!>
! 		previously named getAllMyReferences
  */
  FCO::ReferenceRepList FCO::getTransitiveReferencesToMe() const
--- 187,193 ----
  
  /*
! 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/MetaInterpreter2004/Rep/ReferenceRep.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ReferenceRep.cpp	10 Mar 2004 02:36:29 -0000	1.7
--- ReferenceRep.cpp	10 Mar 2004 20:03:32 -0000	1.8
***************
*** 215,222 ****
  bool ReferenceRep::finalize()
  {
- 	m_allReferees = m_finalReferees;
- 	return true; //<!>
- 	// right now do not perform the calc
- 
  	bool value_set = false;
  	bool same_kind = true;
--- 215,218 ----