[GME-commit] GMESRC/GME/Mga MgaComplexOps.cpp,1.11,1.12

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

Update of /project/gme-repository/GMESRC/GME/Mga
In directory escher:/tmp/cvs-serv4453

Modified Files:
	MgaComplexOps.cpp 
Log Message:
Relids increase as the derivation chain enlarges.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MgaComplexOps.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaComplexOps.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MgaComplexOps.cpp	30 Aug 2005 22:25:30 -0000	1.11
--- MgaComplexOps.cpp	1 Sep 2005 20:24:00 -0000	1.12
***************
*** 1482,1492 ****
  						if( !prim) // it was a child of a primary derived, being detached
  						{
! 							long relid = nobj[ai]-RELIDSPACE; // revert a secondary derived objects relid to a normal relid
! 							if(relid >= 0 && relid < RELIDSPACE) 
  							{
  								// this command would cause ambiguity if the parent has plain children
  								//nobj[ai] = relid; // object will be no more secondary derived!
  								// that is why we use new relids
- 								ASSERT( nextrelid >= 0 && nextrelid < RELIDSPACE);
  								nobj[ai] = nextrelid;
  							}
--- 1482,1507 ----
  						if( !prim) // it was a child of a primary derived, being detached
  						{
! 							// since it was called recursively we know for sure that
! 							// this object is a secondary derived object along with its
! 							// parent. 
! 							// (the level of the derivation in its case might have been 
! 							// higher than the parent's level of derivation)
! 							// but since the parent is detached totally from its
! 							// base, these kinds of children (for which the method
! 							// has been invoked recursively) will become archetypes
! 							// no matter how they have been derived originally
! 							// that is why the relid has to be decreased to the
! 							// [0, RELIDSPACE) interval
! 							
! 							// revert a secondary derived objects relid to a normal relid
! 							//long relid = nobj[ai];
! 							//ASSERT( relid >= 0);
! 							//while( relid >= RELIDSPACE) relid -= RELIDSPACE;
! 
! 							if( nextrelid >= 0 && nextrelid < RELIDSPACE)
  							{
  								// this command would cause ambiguity if the parent has plain children
  								//nobj[ai] = relid; // object will be no more secondary derived!
  								// that is why we use new relids
  								nobj[ai] = nextrelid;
  							}
***************
*** 1567,1573 ****
  							ITERATE_THROUGH( mine) { 
  								++l3;
- 							//	CoreObj nchild;
- 							//	ObjTreeCopy(mgaproject, ITER, nchild, crealist);
- 							//	nchild[ai] = nobj;
  							}
  						}
--- 1582,1585 ----