[GME-commit]
GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep Any.cpp,1.13,1.14
AspectRep.cpp,1.15,1.16 Broker.cpp,1.8,1.9 ConnJoint.cpp,1.11,1.12
ConnectionRep.cpp,1.10,1.11 Dumper.cpp,1.28,1.29 FCO.cpp,1.13,1.14
FolderRep.cpp,1.11,1.12 ModelRep.cpp,1.16,1.17
ReferenceRep.cpp,1.12,1.13 RootFolder.cpp,1.4,1.5
SetRep.cpp,1.7,1.8 Sheet.cpp,1.10,1.11
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Tue Jun 21 18:16:48 CDT 2005
- Previous message: [GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004
BON2Component.cpp,1.27,1.28
- Next message: [GME-commit]
GMESRC/GME/MgaUtil GmeDlg.cpp,1.10,1.11 GmeDlg.h,1.9,1.10
MgaRegistrar.cpp,1.41,1.42 MgaRegistrar.h,1.18,1.19
MgaUtil.rc,1.46,1.47 resource.h,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
In directory escher:/tmp/cvs-serv1752/Rep
Modified Files:
Any.cpp AspectRep.cpp Broker.cpp ConnJoint.cpp
ConnectionRep.cpp Dumper.cpp FCO.cpp FolderRep.cpp
ModelRep.cpp ReferenceRep.cpp RootFolder.cpp SetRep.cpp
Sheet.cpp
Log Message:
Iterators used/handled more conservatively again. (Modified back).
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: AspectRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/AspectRep.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AspectRep.cpp 16 May 2005 18:41:01 -0000 1.15
--- AspectRep.cpp 21 Jun 2005 17:16:46 -0000 1.16
***************
*** 222,228 ****
{
std::vector<RoleRep>::const_iterator it = m_roleFinalList.begin();
- std::vector<RoleRep>::const_iterator en = m_roleFinalList.end();
bool found = false;
! while ( it != en && !found)
{
if ( a_role.getFCOPtr() == it->getFCOPtr() &&
--- 222,227 ----
{
std::vector<RoleRep>::const_iterator it = m_roleFinalList.begin();
bool found = false;
! while ( it != m_roleFinalList.end() && !found)
{
if ( a_role.getFCOPtr() == it->getFCOPtr() &&
***************
*** 265,270 ****
std::vector<FCO*>::iterator init_it = m_fcoInitialList.begin();
! std::vector<FCO*>::iterator init_en = m_fcoInitialList.end();
! for( ; init_it != init_en; ++init_it)
{
FCO* fco_ptr = *init_it;
--- 264,268 ----
std::vector<FCO*>::iterator init_it = m_fcoInitialList.begin();
! for( ; init_it != m_fcoInitialList.end(); ++init_it)
{
FCO* fco_ptr = *init_it;
***************
*** 282,287 ****
// a task similar to ModelRep::inherit needs to be done
std::vector< RoleRep>::iterator r_init_it = m_roleInitialList.begin();
! std::vector< RoleRep>::iterator r_init_en = m_roleInitialList.end();
! for( ; r_init_it != r_init_en; ++r_init_it)
{
FCO* fco_ptr = r_init_it->getFCOPtr();
--- 280,284 ----
// a task similar to ModelRep::inherit needs to be done
std::vector< RoleRep>::iterator r_init_it = m_roleInitialList.begin();
! for( ; r_init_it != m_roleInitialList.end(); ++r_init_it)
{
FCO* fco_ptr = r_init_it->getFCOPtr();
***************
*** 325,330 ****
PartCompare partCompare;
ModelPartsMap_Iterator it = m_partsMap.begin();
! ModelPartsMap_Iterator en = m_partsMap.end();
! for( ; it != en; ++it)
{
PartRepSeries &p = it->second;
--- 322,326 ----
PartCompare partCompare;
ModelPartsMap_Iterator it = m_partsMap.begin();
! for( ; it != m_partsMap.end(); ++it)
{
PartRepSeries &p = it->second;
Index: Dumper.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Dumper.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Dumper.cpp 26 Jan 2005 17:31:06 -0000 1.28
--- Dumper.cpp 21 Jun 2005 17:16:46 -0000 1.29
***************
*** 41,48 ****
{
std::vector<FolderRep*>::iterator it( m_folderList.begin());
! std::vector<FolderRep*>::iterator en( m_folderList.end());
! while( it != en && !(*it)->isFCOContained( fco))
++it;
! return it != en;
}
--- 41,47 ----
{
std::vector<FolderRep*>::iterator it( m_folderList.begin());
! while( it != m_folderList.end() && !(*it)->isFCOContained( fco))
++it;
! return it != m_folderList.end();
}
***************
*** 151,156 ****
// task 1
ModelRep_Iterator mod_iter( m_modelList.begin());
! ModelRep_Iterator mod_end ( m_modelList.end());
! for( ; mod_iter != mod_end; ++mod_iter)
(*mod_iter)->inherit();
--- 150,154 ----
// task 1
ModelRep_Iterator mod_iter( m_modelList.begin());
! for( ; mod_iter != m_modelList.end(); ++mod_iter)
(*mod_iter)->inherit();
***************
*** 158,168 ****
// the refs first because the connections need the refs !
ReferenceRep_Iterator ref_iter( m_refList.begin());
! ReferenceRep_Iterator ref_end ( m_refList.end());
! for( ; ref_iter != ref_end; ++ref_iter)
(*ref_iter)->inherit();
ref_iter = m_refList.begin();
! ref_end = m_refList.end();
! for( ; ref_iter != ref_end; ++ref_iter)
if (!(*ref_iter)->finalize())
{
--- 156,164 ----
// the refs first because the connections need the refs !
ReferenceRep_Iterator ref_iter( m_refList.begin());
! for( ; ref_iter != m_refList.end(); ++ref_iter)
(*ref_iter)->inherit();
ref_iter = m_refList.begin();
! for( ; ref_iter != m_refList.end(); ++ref_iter)
if (!(*ref_iter)->finalize())
{
***************
*** 172,195 ****
// task 3
ConnectionRep_Iterator conn_iter( m_connList.begin());
! ConnectionRep_Iterator conn_end ( m_connList.end());
! for( ; conn_iter != conn_end; ++conn_iter)
(*conn_iter)->inherit();
// task 4 - for all sets on the sheet
SetRep_Iterator set_iter( m_setList.begin());
! SetRep_Iterator set_end ( m_setList.end());
! for( ; set_iter != set_end; ++set_iter)
(*set_iter)->inherit();
// task 5: folder element hierarchies
std::vector<FolderRep*>::iterator folder_iter( m_folderList.begin());
! std::vector<FolderRep*>::iterator folder_end ( m_folderList.end());
! for( ; folder_iter != folder_end; ++folder_iter)
(*folder_iter)->extendMembership();
// task 6
std::vector<AspectRep*>::iterator asp_iter( m_aspectList.begin());
! std::vector<AspectRep*>::iterator asp_end ( m_aspectList.end());
! for( ; asp_iter != asp_end; ++asp_iter)
(*asp_iter)->extendAspectWithDescendants();
}
--- 168,187 ----
// task 3
ConnectionRep_Iterator conn_iter( m_connList.begin());
! for( ; conn_iter != m_connList.end(); ++conn_iter)
(*conn_iter)->inherit();
// task 4 - for all sets on the sheet
SetRep_Iterator set_iter( m_setList.begin());
! for( ; set_iter != m_setList.end(); ++set_iter)
(*set_iter)->inherit();
// task 5: folder element hierarchies
std::vector<FolderRep*>::iterator folder_iter( m_folderList.begin());
! for( ; folder_iter != m_folderList.end(); ++folder_iter)
(*folder_iter)->extendMembership();
// task 6
std::vector<AspectRep*>::iterator asp_iter( m_aspectList.begin());
! for( ; asp_iter != m_aspectList.end(); ++asp_iter)
(*asp_iter)->extendAspectWithDescendants();
}
***************
*** 209,214 ****
{
{FcoRep_Iterator it0( m_fcoRepList.begin());
! FcoRep_Iterator en0( m_fcoRepList.end());
! for( ; it0 != en0; ++it0 )
{
std::vector<FCO*> children;
--- 201,205 ----
{
{FcoRep_Iterator it0( m_fcoRepList.begin());
! for( ; it0 != m_fcoRepList.end(); ++it0 )
{
std::vector<FCO*> children;
***************
*** 217,228 ****
std::vector<FCO*>::iterator child_it = children.begin();
! std::vector<FCO*>::iterator child_en = children.end();
! for( ; child_it != child_en; ++child_it )
inheritConstraintsAndAttributes( *it0, *child_it);
}}
{AtomRep_Iterator it1 = m_atomList.begin();
! AtomRep_Iterator en1 = m_atomList.end();
! for( ; it1 != en1; ++it1 )
{
std::vector<FCO*> children;
--- 208,217 ----
std::vector<FCO*>::iterator child_it = children.begin();
! for( ; child_it != children.end(); ++child_it )
inheritConstraintsAndAttributes( *it0, *child_it);
}}
{AtomRep_Iterator it1 = m_atomList.begin();
! for( ; it1 != m_atomList.end(); ++it1 )
{
std::vector<FCO*> children;
***************
*** 231,242 ****
std::vector<FCO*>::iterator child_it = children.begin();
! std::vector<FCO*>::iterator child_en = children.end();
! for( ; child_it != child_en; ++child_it )
inheritConstraintsAndAttributes( *it1, *child_it);
}}
{ModelRep_Iterator it2 = m_modelList.begin();
! ModelRep_Iterator en2 = m_modelList.end();
! for( ; it2 != en2; ++it2 )
{
std::vector<FCO*> children;
--- 220,229 ----
std::vector<FCO*>::iterator child_it = children.begin();
! for( ; child_it != children.end(); ++child_it )
inheritConstraintsAndAttributes( *it1, *child_it);
}}
{ModelRep_Iterator it2 = m_modelList.begin();
! for( ; it2 != m_modelList.end(); ++it2 )
{
std::vector<FCO*> children;
***************
*** 245,250 ****
std::vector<FCO*>::iterator child_it = children.begin();
! std::vector<FCO*>::iterator child_en = children.end();
! for( ; child_it != child_en; ++child_it )
{
ModelRep * child_mod_ptr = dynamic_cast<ModelRep *>( *child_it);
--- 232,236 ----
std::vector<FCO*>::iterator child_it = children.begin();
! for( ; child_it != children.end(); ++child_it )
{
ModelRep * child_mod_ptr = dynamic_cast<ModelRep *>( *child_it);
***************
*** 260,265 ****
{ConnectionRep_Iterator it3 = m_connList.begin();
! ConnectionRep_Iterator en3 = m_connList.end();
! for( ; it3 != en3; ++it3 )
{
std::vector<FCO*> children;
--- 246,250 ----
{ConnectionRep_Iterator it3 = m_connList.begin();
! for( ; it3 != m_connList.end(); ++it3 )
{
std::vector<FCO*> children;
***************
*** 268,279 ****
std::vector<FCO*>::iterator child_it = children.begin();
! std::vector<FCO*>::iterator child_en = children.end();
! for( ; child_it != child_en; ++child_it )
inheritConstraintsAndAttributes( *it3, *child_it);
}}
{SetRep_Iterator it4 = m_setList.begin();
! SetRep_Iterator en4 = m_setList.end();
! for( ; it4 != en4; ++it4 )
{
std::vector<FCO*> children;
--- 253,262 ----
std::vector<FCO*>::iterator child_it = children.begin();
! for( ; child_it != children.end(); ++child_it )
inheritConstraintsAndAttributes( *it3, *child_it);
}}
{SetRep_Iterator it4 = m_setList.begin();
! for( ; it4 != m_setList.end(); ++it4 )
{
std::vector<FCO*> children;
***************
*** 282,287 ****
std::vector<FCO*>::iterator child_it = children.begin();
! std::vector<FCO*>::iterator child_en = children.end();
! for( ; child_it != child_en; ++child_it )
{
inheritConstraintsAndAttributes( *it4, *child_it);
--- 265,269 ----
std::vector<FCO*>::iterator child_it = children.begin();
! for( ; child_it != children.end(); ++child_it )
{
inheritConstraintsAndAttributes( *it4, *child_it);
***************
*** 290,295 ****
{ReferenceRep_Iterator it5 = m_refList.begin();
! ReferenceRep_Iterator en5 = m_refList.end();
! for( ; it5 != en5; ++it5 )
{
std::vector<FCO*> children;
--- 272,276 ----
{ReferenceRep_Iterator it5 = m_refList.begin();
! for( ; it5 != m_refList.end(); ++it5 )
{
std::vector<FCO*> children;
***************
*** 298,303 ****
std::vector<FCO*>::iterator child_it = children.begin();
! std::vector<FCO*>::iterator child_en = children.end();
! for( ; child_it != child_en; ++child_it )
inheritConstraintsAndAttributes( *it5, *child_it);
}}
--- 279,283 ----
std::vector<FCO*>::iterator child_it = children.begin();
! for( ; child_it != children.end(); ++child_it )
inheritConstraintsAndAttributes( *it5, *child_it);
}}
***************
*** 305,310 ****
{// since folders don't inherit, the constraint list will not be changing
FolderRep_Iterator folder_iter( m_folderList.begin());
! FolderRep_Iterator folder_end ( m_folderList.end());
! for( ; folder_iter != folder_end; ++folder_iter)
(*folder_iter)->addFinalConstraintList( (*folder_iter)->getInitialConstraintRepPtrList());
}
--- 285,289 ----
{// since folders don't inherit, the constraint list will not be changing
FolderRep_Iterator folder_iter( m_folderList.begin());
! for( ; folder_iter != m_folderList.end(); ++folder_iter)
(*folder_iter)->addFinalConstraintList( (*folder_iter)->getInitialConstraintRepPtrList());
}
***************
*** 316,321 ****
// builds the Parts for each Aspect of all Models
ModelRep_Iterator jt( m_modelList.begin());
! ModelRep_Iterator je( m_modelList.end());
! for( ; jt != je; ++jt)
{
ModelRep * mod_ptr = *jt;
--- 295,299 ----
// builds the Parts for each Aspect of all Models
ModelRep_Iterator jt( m_modelList.begin());
! for( ; jt != m_modelList.end(); ++jt)
{
ModelRep * mod_ptr = *jt;
***************
*** 329,334 ****
// for all aspects
std::vector<AspectRep*>::iterator it( m_aspectList.begin());
! std::vector<AspectRep*>::iterator en( m_aspectList.end());
! for( ; it != en; ++it)
{
AspectRep * asp_ptr = *it;
--- 307,311 ----
// for all aspects
std::vector<AspectRep*>::iterator it( m_aspectList.begin());
! for( ; it != m_aspectList.end(); ++it)
{
AspectRep * asp_ptr = *it;
***************
*** 360,365 ****
// for all aspects
std::vector<AspectRep*>::iterator it( m_aspectList.begin());
! std::vector<AspectRep*>::iterator en( m_aspectList.end());
! for( ; it != en; ++it)
{
AspectRep * asp_ptr = *it;
--- 337,341 ----
// for all aspects
std::vector<AspectRep*>::iterator it( m_aspectList.begin());
! for( ; it != m_aspectList.end(); ++it)
{
AspectRep * asp_ptr = *it;
***************
*** 368,373 ****
// for all models
ModelRep_Iterator jt( m_modelList.begin());
! ModelRep_Iterator je( m_modelList.end());
! for( ; jt != je; ++jt)
{
ModelRep * parent_mod_ptr = *jt;
--- 344,348 ----
// for all models
ModelRep_Iterator jt( m_modelList.begin());
! for( ; jt != m_modelList.end(); ++jt)
{
ModelRep * parent_mod_ptr = *jt;
***************
*** 377,382 ****
const AspectRep::PartRepSeries & part_series = asp_ptr->getPartSeries( parent_mod_ptr);
AspectRep::PartRepSeries_ConstIterator kt = part_series.begin();
! AspectRep::PartRepSeries_ConstIterator ke = part_series.end();
! for ( ; kt != ke; ++kt)
{
PartRep part = *kt;
--- 352,356 ----
const AspectRep::PartRepSeries & part_series = asp_ptr->getPartSeries( parent_mod_ptr);
AspectRep::PartRepSeries_ConstIterator kt = part_series.begin();
! for ( ; kt != part_series.end(); ++kt)
{
PartRep part = *kt;
***************
*** 524,531 ****
std::vector< AspectRep *> asp_intersect = reference->getAspectsIntersection();
std::vector< AspectRep *>::iterator asp_intersect_it = asp_intersect.begin();
! std::vector< AspectRep *>::iterator asp_intersect_en = asp_intersect.end();
! while( asp_intersect_it != asp_intersect_en && (*asp_intersect_it)->getName() != asp_name)
++asp_intersect_it;
! if ( asp_intersect_it != asp_intersect_en)
default_kind_aspect_name = asp_name;
else // if not then the first aspect is the default
--- 498,504 ----
std::vector< AspectRep *> asp_intersect = reference->getAspectsIntersection();
std::vector< AspectRep *>::iterator asp_intersect_it = asp_intersect.begin();
! while( asp_intersect_it != asp_intersect.end() && (*asp_intersect_it)->getName() != asp_name)
++asp_intersect_it;
! if ( asp_intersect_it != asp_intersect.end())
default_kind_aspect_name = asp_name;
else // if not then the first aspect is the default
***************
*** 549,556 ****
std::vector< AspectRep*> sub_model_aspects = sub_model->getFinalAspectRepPtrList();
std::vector< AspectRep*>::iterator sub_model_aspect_it = sub_model_aspects.begin();
! std::vector< AspectRep*>::iterator sub_model_aspect_en = sub_model_aspects.end();
! while( sub_model_aspect_it != sub_model_aspect_en && (*sub_model_aspect_it)->getName() != asp_name)
++sub_model_aspect_it;
! if ( sub_model_aspect_it != sub_model_aspect_en)
default_kind_aspect_name = asp_name;
else // if not then the first aspect is the default
--- 522,528 ----
std::vector< AspectRep*> sub_model_aspects = sub_model->getFinalAspectRepPtrList();
std::vector< AspectRep*>::iterator sub_model_aspect_it = sub_model_aspects.begin();
! while( sub_model_aspect_it != sub_model_aspects.end() && (*sub_model_aspect_it)->getName() != asp_name)
++sub_model_aspect_it;
! if ( sub_model_aspect_it != sub_model_aspects.end())
default_kind_aspect_name = asp_name;
else // if not then the first aspect is the default
***************
*** 595,601 ****
std::vector< AspectRep *> asp_intersect = reference->getAspectsIntersection();
std::vector< AspectRep *>::iterator asp_intersect_it = asp_intersect.begin();
- std::vector< AspectRep *>::iterator asp_intersect_en = asp_intersect.end();
AspectRep * ar = 0;
! while( !ar && asp_intersect_it != asp_intersect_en)
{
if ( regVal.compare( (*asp_intersect_it)->getName()) == 0)
--- 567,572 ----
std::vector< AspectRep *> asp_intersect = reference->getAspectsIntersection();
std::vector< AspectRep *>::iterator asp_intersect_it = asp_intersect.begin();
AspectRep * ar = 0;
! while( !ar && asp_intersect_it != asp_intersect.end())
{
if ( regVal.compare( (*asp_intersect_it)->getName()) == 0)
***************
*** 673,679 ****
std::map<unsigned int, unsigned int>::iterator it = asp_map.begin();
- std::map<unsigned int, unsigned int>::iterator en = asp_map.end();
// going through the map elements (members of the table) and fetch the user option
! while ( it != en)
{
// the maps key is the row_id obtained from the AddEntry
--- 644,649 ----
std::map<unsigned int, unsigned int>::iterator it = asp_map.begin();
// going through the map elements (members of the table) and fetch the user option
! while ( it != asp_map.end())
{
// the maps key is the row_id obtained from the AddEntry
***************
*** 776,781 ****
std::vector<AspectRep *>::const_iterator asp_iter( m_aspectList.begin());
! std::vector<AspectRep *>::const_iterator asp_end ( m_aspectList.end());
! for( ; asp_iter != asp_end; ++asp_iter )
{
if ( (*asp_iter)->getName() == name_to_find )
--- 746,750 ----
std::vector<AspectRep *>::const_iterator asp_iter( m_aspectList.begin());
! for( ; asp_iter != m_aspectList.end(); ++asp_iter )
{
if ( (*asp_iter)->getName() == name_to_find )
***************
*** 794,806 ****
ConnectionRep_Iterator conn_iter( m_connList.begin());
- ConnectionRep_Iterator conn_end ( m_connList.end());
// for all connections on the sheet
! for( ; conn_iter != conn_end; ++conn_iter)
(*conn_iter)->createConstraints( this);
// models
std::vector<ModelRep*>::const_iterator it_m = m_modelList.begin();
! std::vector<ModelRep*>::const_iterator en_m = m_modelList.end();
! for( ; it_m != en_m; ++it_m)
{
(*it_m)->createConstraints( this);
--- 763,773 ----
ConnectionRep_Iterator conn_iter( m_connList.begin());
// for all connections on the sheet
! for( ; conn_iter != m_connList.end(); ++conn_iter)
(*conn_iter)->createConstraints( this);
// models
std::vector<ModelRep*>::const_iterator it_m = m_modelList.begin();
! for( ; it_m != m_modelList.end(); ++it_m)
{
(*it_m)->createConstraints( this);
***************
*** 827,832 ****
// folders
std::vector<FolderRep*>::iterator it_fd = m_folderList.begin();
! std::vector<FolderRep*>::iterator en_fd = m_folderList.end();
! for( ; it_fd != en_fd; ++it_fd)
{
(*it_fd)->createConstraints( this);
--- 794,798 ----
// folders
std::vector<FolderRep*>::iterator it_fd = m_folderList.begin();
! for( ; it_fd != m_folderList.end(); ++it_fd)
{
(*it_fd)->createConstraints( this);
***************
*** 865,870 ****
std::sort( m_constraintList.begin(), m_constraintList.end(), lex );
ConstraintRep_Iterator it_cons1 = m_constraintList.begin();
! ConstraintRep_Iterator en_cons1 = m_constraintList.end();
! for( ; it_cons1 != en_cons1; ++it_cons1)
if (!(*it_cons1)->isAttached())
{
--- 831,835 ----
std::sort( m_constraintList.begin(), m_constraintList.end(), lex );
ConstraintRep_Iterator it_cons1 = m_constraintList.begin();
! for( ; it_cons1 != m_constraintList.end(); ++it_cons1)
if (!(*it_cons1)->isAttached())
{
***************
*** 886,891 ****
ConstraintFuncRep_Iterator it_cons2 = m_constraintFuncList.begin();
! ConstraintFuncRep_Iterator en_cons2 = m_constraintFuncList.end();
! for( ; it_cons2 != en_cons2; ++it_cons2)
{
mmm += (*it_cons2)->doDump();
--- 851,855 ----
ConstraintFuncRep_Iterator it_cons2 = m_constraintFuncList.begin();
! for( ; it_cons2 != m_constraintFuncList.end(); ++it_cons2)
{
mmm += (*it_cons2)->doDump();
***************
*** 906,911 ****
AttributeRep_Iterator it = m_attributeList.begin();
! AttributeRep_Iterator en = m_attributeList.end();
! for( ; it != en; ++it)
//if ((*it)->hasAnyOwner() < 1) // it means is a global variable: wrong, it may be local without owner!!
if((*it)->isGlobal()) // thus not dumping orphan attributes
--- 870,874 ----
AttributeRep_Iterator it = m_attributeList.begin();
! for( ; it != m_attributeList.end(); ++it)
//if ((*it)->hasAnyOwner() < 1) // it means is a global variable: wrong, it may be local without owner!!
if((*it)->isGlobal()) // thus not dumping orphan attributes
***************
*** 926,933 ****
std::sort( m_atomList.begin(), m_atomList.end(), lex );
std::vector<AtomRep*>::const_iterator it_b = m_atomList.begin();
! std::vector<AtomRep*>::const_iterator en_b = m_atomList.end();
! if ( it_b != en_b)
{
! for( ; it_b != en_b; ++it_b)
{
if ( !(*it_b)->isAbstract())
--- 889,895 ----
std::sort( m_atomList.begin(), m_atomList.end(), lex );
std::vector<AtomRep*>::const_iterator it_b = m_atomList.begin();
! if ( it_b != m_atomList.end())
{
! for( ; it_b != m_atomList.end(); ++it_b)
{
if ( !(*it_b)->isAbstract())
***************
*** 954,961 ****
std::sort( m_setList.begin(), m_setList.end(), lex );
std::vector<SetRep*>::const_iterator it_c = m_setList.begin();
! std::vector<SetRep*>::const_iterator en_c = m_setList.end();
! if ( it_c != en_c)
{
! for( ; it_c != en_c; ++it_c)
{
if ( !(*it_c)->isAbstract())
--- 916,922 ----
std::sort( m_setList.begin(), m_setList.end(), lex );
std::vector<SetRep*>::const_iterator it_c = m_setList.begin();
! if ( it_c != m_setList.end())
{
! for( ; it_c != m_setList.end(); ++it_c)
{
if ( !(*it_c)->isAbstract())
***************
*** 982,989 ****
std::sort( m_connList.begin(), m_connList.end(), lex );
std::vector<ConnectionRep*>::const_iterator it_cn = m_connList.begin();
! std::vector<ConnectionRep*>::const_iterator en_cn = m_connList.end();
! if ( it_cn != en_cn)
{
! for( ; it_cn != en_cn; ++it_cn)
{
if ( !(*it_cn)->isAbstract())
--- 943,949 ----
std::sort( m_connList.begin(), m_connList.end(), lex );
std::vector<ConnectionRep*>::const_iterator it_cn = m_connList.begin();
! if ( it_cn != m_connList.end())
{
! for( ; it_cn != m_connList.end(); ++it_cn)
{
if ( !(*it_cn)->isAbstract())
***************
*** 1010,1017 ****
std::sort( m_refList.begin(), m_refList.end(), lex );
std::vector<ReferenceRep*>::const_iterator it_ref = m_refList.begin();
! std::vector<ReferenceRep*>::const_iterator en_ref = m_refList.end();
! if ( it_ref != en_ref)
{
! for( ; it_ref != en_ref; ++it_ref)
{
if ( !(*it_ref)->isAbstract())
--- 970,976 ----
std::sort( m_refList.begin(), m_refList.end(), lex );
std::vector<ReferenceRep*>::const_iterator it_ref = m_refList.begin();
! if ( it_ref != m_refList.end())
{
! for( ; it_ref != m_refList.end(); ++it_ref)
{
if ( !(*it_ref)->isAbstract())
***************
*** 1038,1045 ****
std::sort( m_modelList.begin(), m_modelList.end(), lex );
std::vector<ModelRep*>::const_iterator it_m = m_modelList.begin();
! std::vector<ModelRep*>::const_iterator en_m = m_modelList.end();
! if ( it_m != en_m)
{
! for( ; it_m != en_m; ++it_m)
{
if ( !(*it_m)->isAbstract())
--- 997,1003 ----
std::sort( m_modelList.begin(), m_modelList.end(), lex );
std::vector<ModelRep*>::const_iterator it_m = m_modelList.begin();
! if ( it_m != m_modelList.end())
{
! for( ; it_m != m_modelList.end(); ++it_m)
{
if ( !(*it_m)->isAbstract())
***************
*** 1066,1073 ****
std::sort( m_folderList.begin(), m_folderList.end(), lex );
std::vector<FolderRep*>::iterator it_fd = m_folderList.begin();
! std::vector<FolderRep*>::iterator en_fd = m_folderList.end();
! if ( it_fd != en_fd)
{
! for( ; it_fd != en_fd; ++it_fd)
{
mmm += (*it_fd)->doDump();
--- 1024,1030 ----
std::sort( m_folderList.begin(), m_folderList.end(), lex );
std::vector<FolderRep*>::iterator it_fd = m_folderList.begin();
! if ( it_fd != m_folderList.end())
{
! for( ; it_fd != m_folderList.end(); ++it_fd)
{
mmm += (*it_fd)->doDump();
***************
*** 1097,1102 ****
// for all aspects
{std::vector<AspectRep*>::iterator it( m_aspectList.begin());
! std::vector<AspectRep*>::iterator en( m_aspectList.end());
! for( ; it != en; ++it)
{
const std::string asp_name = (*it)->getName();
--- 1054,1058 ----
// for all aspects
{std::vector<AspectRep*>::iterator it( m_aspectList.begin());
! for( ; it != m_aspectList.end(); ++it)
{
const std::string asp_name = (*it)->getName();
***************
*** 1136,1141 ****
bool res = true;
FolderRep_ConstIterator it6 = m_folderList.begin();
! FolderRep_ConstIterator en6 = m_folderList.end();
! for( ; it6 != en6; ++it6 )
{
if ((*it6)->isEmpty())
--- 1092,1096 ----
bool res = true;
FolderRep_ConstIterator it6 = m_folderList.begin();
! for( ; it6 != m_folderList.end(); ++it6 )
{
if ((*it6)->isEmpty())
***************
*** 1153,1158 ****
bool res = true;
AttributeRep_Iterator it = m_attributeList.begin();
! AttributeRep_Iterator en = m_attributeList.end();
! for( ; it != en; ++it)
{
if ((*it)->hasAnyOwner() < 1 && !(*it)->isGlobal())
--- 1108,1112 ----
bool res = true;
AttributeRep_Iterator it = m_attributeList.begin();
! for( ; it != m_attributeList.end(); ++it)
{
if ((*it)->hasAnyOwner() < 1 && !(*it)->isGlobal())
***************
*** 1170,1175 ****
bool res = true;
{FcoRep_Iterator it0( m_fcoRepList.begin());
! FcoRep_Iterator en0( m_fcoRepList.end());
! for( ; it0 != en0; ++it0 )
{
/*if (!(*it0)->checkInheritance()) these kinds always have different descendants
--- 1124,1128 ----
bool res = true;
{FcoRep_Iterator it0( m_fcoRepList.begin());
! for( ; it0 != m_fcoRepList.end(); ++it0 )
{
/*if (!(*it0)->checkInheritance()) these kinds always have different descendants
***************
*** 1188,1193 ****
{AtomRep_Iterator it1 = m_atomList.begin();
! AtomRep_Iterator en1 = m_atomList.end();
! for( ; it1 != en1; ++it1 )
{
if (!(*it1)->checkInheritance())
--- 1141,1145 ----
{AtomRep_Iterator it1 = m_atomList.begin();
! for( ; it1 != m_atomList.end(); ++it1 )
{
if (!(*it1)->checkInheritance())
***************
*** 1201,1206 ****
{ModelRep_Iterator it2 = m_modelList.begin();
! ModelRep_Iterator en2 = m_modelList.end();
! for( ; it2 != en2; ++it2 )
{
if (!(*it2)->checkInheritance())
--- 1153,1157 ----
{ModelRep_Iterator it2 = m_modelList.begin();
! for( ; it2 != m_modelList.end(); ++it2 )
{
if (!(*it2)->checkInheritance())
***************
*** 1219,1224 ****
{ConnectionRep_Iterator it3 = m_connList.begin();
! ConnectionRep_Iterator en3 = m_connList.end();
! for( ; it3 != en3; ++it3 )
{
if (!(*it3)->checkInheritance())
--- 1170,1174 ----
{ConnectionRep_Iterator it3 = m_connList.begin();
! for( ; it3 != m_connList.end(); ++it3 )
{
if (!(*it3)->checkInheritance())
***************
*** 1233,1238 ****
{SetRep_Iterator it4 = m_setList.begin();
! SetRep_Iterator en4 = m_setList.end();
! for( ; it4 != en4; ++it4 )
{
if (!(*it4)->checkInheritance())
--- 1183,1187 ----
{SetRep_Iterator it4 = m_setList.begin();
! for( ; it4 != m_setList.end(); ++it4 )
{
if (!(*it4)->checkInheritance())
***************
*** 1247,1252 ****
{ReferenceRep_Iterator it5 = m_refList.begin();
! ReferenceRep_Iterator en5 = m_refList.end();
! for( ; it5 != en5; ++it5 )
{
if (!(*it5)->checkInheritance())
--- 1196,1200 ----
{ReferenceRep_Iterator it5 = m_refList.begin();
! for( ; it5 != m_refList.end(); ++it5 )
{
if (!(*it5)->checkInheritance())
***************
*** 1280,1325 ****
{
{FcoRep_Iterator it0( m_fcoRepList.begin());
! FcoRep_Iterator en0( m_fcoRepList.end());
! for( ; it0 != en0; ++it0 )
Broker::initFromObj( (*it0)->getPtr(), (*it0)->getParentFolder(), (*it0)->getMyKindStr());}
{AtomRep_Iterator it1 = m_atomList.begin();
! AtomRep_Iterator en1 = m_atomList.end();
! for( ; it1 != en1; ++it1 )
Broker::initFromObj( (*it1)->getPtr(), (*it1)->getParentFolder(), (*it1)->getMyKindStr());}
{ModelRep_Iterator it2 = m_modelList.begin();
! ModelRep_Iterator en2 = m_modelList.end();
! for( ; it2 != en2; ++it2 )
Broker::initFromObj( (*it2)->getPtr(), (*it2)->getParentFolder(), (*it2)->getMyKindStr());}
{ConnectionRep_Iterator it3 = m_connList.begin();
! ConnectionRep_Iterator en3 = m_connList.end();
! for( ; it3 != en3; ++it3 )
Broker::initFromObj( (*it3)->getPtr(), (*it3)->getParentFolder(), (*it3)->getMyKindStr());}
{SetRep_Iterator it4 = m_setList.begin();
! SetRep_Iterator en4 = m_setList.end();
! for( ; it4 != en4; ++it4 )
Broker::initFromObj( (*it4)->getPtr(), (*it4)->getParentFolder(), (*it4)->getMyKindStr());}
{ReferenceRep_Iterator it5 = m_refList.begin();
! ReferenceRep_Iterator en5 = m_refList.end();
! for( ; it5 != en5; ++it5 )
Broker::initFromObj( (*it5)->getPtr(), (*it5)->getParentFolder(), (*it5)->getMyKindStr());}
{FolderRep_Iterator it6 = m_folderList.begin();
! FolderRep_Iterator en6 = m_folderList.end();
! for( ; it6 != en6; ++it6 )
Broker::initFromObj( (*it6)->getPtr(), (*it6)->getParentFolder(), (*it6)->getMyKindStr());}
{AspectRep_Iterator it7 = m_aspectList.begin();
! AspectRep_Iterator en7 = m_aspectList.end();
! for( ; it7 != en7; ++it7)
Broker::initFromAspectObj( (*it7)->getPtr(), (*it7)->getName(), Sheet::m_BON_Project_Root_Folder);}
{AttributeRep_Iterator it8 = m_attributeList.begin();
! AttributeRep_Iterator en8 = m_attributeList.end();
! for (; it8 != en8; ++it8)
Broker::initFromObj( (*it8)->getPtr(), (*it8)->getParentFolder(), (*it8)->getMyKindStr());}
--- 1228,1264 ----
{
{FcoRep_Iterator it0( m_fcoRepList.begin());
! for( ; it0 != m_fcoRepList.end(); ++it0 )
Broker::initFromObj( (*it0)->getPtr(), (*it0)->getParentFolder(), (*it0)->getMyKindStr());}
{AtomRep_Iterator it1 = m_atomList.begin();
! for( ; it1 != m_atomList.end(); ++it1 )
Broker::initFromObj( (*it1)->getPtr(), (*it1)->getParentFolder(), (*it1)->getMyKindStr());}
{ModelRep_Iterator it2 = m_modelList.begin();
! for( ; it2 != m_modelList.end(); ++it2 )
Broker::initFromObj( (*it2)->getPtr(), (*it2)->getParentFolder(), (*it2)->getMyKindStr());}
{ConnectionRep_Iterator it3 = m_connList.begin();
! for( ; it3 != m_connList.end(); ++it3 )
Broker::initFromObj( (*it3)->getPtr(), (*it3)->getParentFolder(), (*it3)->getMyKindStr());}
{SetRep_Iterator it4 = m_setList.begin();
! for( ; it4 != m_setList.end(); ++it4 )
Broker::initFromObj( (*it4)->getPtr(), (*it4)->getParentFolder(), (*it4)->getMyKindStr());}
{ReferenceRep_Iterator it5 = m_refList.begin();
! for( ; it5 != m_refList.end(); ++it5 )
Broker::initFromObj( (*it5)->getPtr(), (*it5)->getParentFolder(), (*it5)->getMyKindStr());}
{FolderRep_Iterator it6 = m_folderList.begin();
! for( ; it6 != m_folderList.end(); ++it6 )
Broker::initFromObj( (*it6)->getPtr(), (*it6)->getParentFolder(), (*it6)->getMyKindStr());}
{AspectRep_Iterator it7 = m_aspectList.begin();
! for( ; it7 != m_aspectList.end(); ++it7)
Broker::initFromAspectObj( (*it7)->getPtr(), (*it7)->getName(), Sheet::m_BON_Project_Root_Folder);}
{AttributeRep_Iterator it8 = m_attributeList.begin();
! for (; it8 != m_attributeList.end(); ++it8)
Broker::initFromObj( (*it8)->getPtr(), (*it8)->getParentFolder(), (*it8)->getMyKindStr());}
***************
*** 1393,1398 ****
std::set<BON::RegistryNode> ch = rn->getChildren();
std::set<BON::RegistryNode>::iterator i = ch.begin();
! std::set<BON::RegistryNode>::iterator e = ch.end();
! for( ; i != e; ++i)
{
asp_order.insert( AspNamePriorityComp::Type( (*i)->getName(), (*i)->getIntegerValue()));
--- 1332,1336 ----
std::set<BON::RegistryNode> ch = rn->getChildren();
std::set<BON::RegistryNode>::iterator i = ch.begin();
! for( ; i != ch.end(); ++i)
{
asp_order.insert( AspNamePriorityComp::Type( (*i)->getName(), (*i)->getIntegerValue()));
***************
*** 1400,1405 ****
std::set< AspNamePriorityComp::Type, AspNamePriorityComp>::iterator it = asp_order.begin();
! std::set< AspNamePriorityComp::Type, AspNamePriorityComp>::iterator en = asp_order.end();
! for( ; it != en; ++it)
{
std::vector<AspectRep *> asp_with_this_name = findAspectBasedOnName( it->first);
--- 1338,1342 ----
std::set< AspNamePriorityComp::Type, AspNamePriorityComp>::iterator it = asp_order.begin();
! for( ; it != asp_order.end(); ++it)
{
std::vector<AspectRep *> asp_with_this_name = findAspectBasedOnName( it->first);
***************
*** 1415,1428 ****
{
std::vector<AspectRep*>::iterator aspvec_it = m_aspectList.begin();
! std::vector<AspectRep*>::iterator aspvec_en = m_aspectList.end();
! for( ; aspvec_it != aspvec_en && needed > 0; ++aspvec_it)
{
std::string asp_name = (*aspvec_it)->getName();
// search for this "aspect name" in the dlg_init_asp vector
std::vector<AspectRep*>::iterator asp_init_it = dlg_aspects_init_order.begin();
! std::vector<AspectRep*>::iterator asp_init_en = dlg_aspects_init_order.end();
! while( asp_init_it != asp_init_en && (*asp_init_it)->getName() != asp_name )
++asp_init_it;
! if ( asp_init_it == asp_init_en) // not found, so either newly introduced aspect or the registry information has been partly deleted
{
dlg_aspects_init_order.push_back( *aspvec_it);
--- 1352,1363 ----
{
std::vector<AspectRep*>::iterator aspvec_it = m_aspectList.begin();
! for( ; aspvec_it != m_aspectList.end() && needed > 0; ++aspvec_it)
{
std::string asp_name = (*aspvec_it)->getName();
// search for this "aspect name" in the dlg_init_asp vector
std::vector<AspectRep*>::iterator asp_init_it = dlg_aspects_init_order.begin();
! while( asp_init_it != dlg_aspects_init_order.end() && (*asp_init_it)->getName() != asp_name )
++asp_init_it;
! if ( asp_init_it == dlg_aspects_init_order.end()) // not found, so either newly introduced aspect or the registry information has been partly deleted
{
dlg_aspects_init_order.push_back( *aspvec_it);
Index: ModelRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ModelRep.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ModelRep.cpp 26 Jan 2005 17:31:06 -0000 1.16
--- ModelRep.cpp 21 Jun 2005 17:16:46 -0000 1.17
***************
*** 53,58 ****
{
RoleMap_Iterator it = m_initialRoleMap.begin();
! RoleMap_Iterator en = m_initialRoleMap.end();
! for( ; it != en; ++it)
{
RoleMapKey fco = it->first; // FCO *
--- 53,57 ----
{
RoleMap_Iterator it = m_initialRoleMap.begin();
! for( ; it != m_initialRoleMap.end(); ++it)
{
RoleMapKey fco = it->first; // FCO *
***************
*** 83,88 ****
RoleMapValue &series = it->second;
RoleSeries_Iterator role_it = series.begin();
! RoleSeries_Iterator role_en = series.end();
! for(; role_it != role_en; ++role_it)
{
role_it->setLongForm( true);
--- 82,86 ----
RoleMapValue &series = it->second;
RoleSeries_Iterator role_it = series.begin();
! for(; role_it != series.end(); ++role_it)
{
role_it->setLongForm( true);
***************
*** 109,114 ****
RoleMap_ConstIterator it = m_initialRoleMap.begin();
! RoleMap_ConstIterator en = m_initialRoleMap.end();
! while ( it != en)
{
FCO * const ptr = it->first; // ModelRep *
--- 107,111 ----
RoleMap_ConstIterator it = m_initialRoleMap.begin();
! while ( it != m_initialRoleMap.end())
{
FCO * const ptr = it->first; // ModelRep *
***************
*** 175,180 ****
RoleMap_ConstIterator it = m_finalRoleMap.begin();
! RoleMap_ConstIterator en = m_finalRoleMap.end();
! while ( it != en)
{
FCO * const ptr = it->first; // ModelRep *
--- 172,176 ----
RoleMap_ConstIterator it = m_finalRoleMap.begin();
! while ( it != m_finalRoleMap.end())
{
FCO * const ptr = it->first; // ModelRep *
***************
*** 194,199 ****
std::vector< ReferenceRep *> refs;
RoleMap_ConstIterator it = m_finalRoleMap.begin();
! RoleMap_ConstIterator en = m_finalRoleMap.end();
! while ( it != en)
{
FCO * const ptr = it->first;
--- 190,194 ----
std::vector< ReferenceRep *> refs;
RoleMap_ConstIterator it = m_finalRoleMap.begin();
! while ( it != m_finalRoleMap.end())
{
FCO * const ptr = it->first;
***************
*** 241,247 ****
RoleMap_Iterator fco_it( m_initialRoleMap.begin());
- RoleMap_Iterator fco_en( m_initialRoleMap.end());
// for each FCO
! for( ; fco_it != fco_en; ++fco_it)
{
RoleMapKey fco_ptr = fco_it->first;
--- 236,241 ----
RoleMap_Iterator fco_it( m_initialRoleMap.begin());
// for each FCO
! for( ; fco_it != m_initialRoleMap.end(); ++fco_it)
{
RoleMapKey fco_ptr = fco_it->first;
***************
*** 255,266 ****
RoleSeries_Iterator role_it = roles.begin();
- RoleSeries_Iterator role_en = roles.end();
// for each role
! for( ; role_it != role_en; ++role_it)
{
std::vector<FCO*>::iterator desc_it = children.begin();
- std::vector<FCO*>::iterator desc_en = children.end();
// for each interface descendant
! for( ; desc_it != desc_en; ++desc_it)
{
// the descendants must have a separate role for each initial role
--- 249,258 ----
RoleSeries_Iterator role_it = roles.begin();
// for each role
! for( ; role_it != roles.end(); ++role_it)
{
std::vector<FCO*>::iterator desc_it = children.begin();
// for each interface descendant
! for( ; desc_it != children.end(); ++desc_it)
{
// the descendants must have a separate role for each initial role
***************
*** 295,308 ****
{
RoleMap_Iterator role_it = m_finalRoleMap.begin();
- RoleMap_Iterator role_en = m_finalRoleMap.end();
// for all roles in this model
! for( ; role_it != role_en; ++role_it)
{
RoleStringLex lex;
std::sort( role_it->second.begin(), role_it->second.end(), lex);
std::vector<AspectRep*>::iterator asp_it = m_finalAspectList.begin();
- std::vector<AspectRep*>::iterator asp_en = m_finalAspectList.end();
// for all my aspects
! for( ; asp_it != asp_en; ++asp_it)
{
// the fco which owns the roles
--- 287,298 ----
{
RoleMap_Iterator role_it = m_finalRoleMap.begin();
// for all roles in this model
! for( ; role_it != m_finalRoleMap.end(); ++role_it)
{
RoleStringLex lex;
std::sort( role_it->second.begin(), role_it->second.end(), lex);
std::vector<AspectRep*>::iterator asp_it = m_finalAspectList.begin();
// for all my aspects
! for( ; asp_it != m_finalAspectList.end(); ++asp_it)
{
// the fco which owns the roles
***************
*** 315,320 ****
// each role of fco is member of aspect
RoleSeries_Iterator jt = role_it->second.begin();
! RoleSeries_Iterator je = role_it->second.end();
! for( ; jt != je; ++jt)
{
PartRep pr( *jt, *asp_it);
--- 305,309 ----
// each role of fco is member of aspect
RoleSeries_Iterator jt = role_it->second.begin();
! for( ; jt != role_it->second.end(); ++jt)
{
PartRep pr( *jt, *asp_it);
***************
*** 326,331 ****
// some roles are going to become part of aspect
RoleSeries_Iterator jt = role_it->second.begin();
! RoleSeries_Iterator je = role_it->second.end();
! for( ; jt != je; ++jt)
{
if ( (*asp_it)->findFinalRole( *jt)) // this role is intended to be in the aspect
--- 315,319 ----
// some roles are going to become part of aspect
RoleSeries_Iterator jt = role_it->second.begin();
! for( ; jt != role_it->second.end(); ++jt)
{
if ( (*asp_it)->findFinalRole( *jt)) // this role is intended to be in the aspect
***************
*** 363,368 ****
{
std::vector<AspectRep*>::const_iterator ii = l.begin();
! std::vector<AspectRep*>::const_iterator en = l.end();
! for( ; ii != en; ++ii)
addFinalAspect(*ii);
}
--- 351,355 ----
{
std::vector<AspectRep*>::const_iterator ii = l.begin();
! for( ; ii != l.end(); ++ii)
addFinalAspect(*ii);
}
***************
*** 418,423 ****
std::vector<AspectRep *>::const_iterator aspects_it = aspect_set.begin();
! std::vector<AspectRep *>::const_iterator aspects_en = aspect_set.end();
! while( aspects_it != aspects_en && !found)
{
std::vector<AspectRep*>::const_iterator ii =
--- 405,409 ----
std::vector<AspectRep *>::const_iterator aspects_it = aspect_set.begin();
! while( aspects_it != aspect_set.end() && !found)
{
std::vector<AspectRep*>::const_iterator ii =
***************
*** 500,505 ****
// all roles (final)
RoleMap_Iterator it = m_finalRoleMap.begin();
! RoleMap_Iterator en = m_finalRoleMap.end();
! for( ; it != en; ++it)
key_list.push_back( it->first);
--- 486,490 ----
// all roles (final)
RoleMap_Iterator it = m_finalRoleMap.begin();
! for( ; it != m_finalRoleMap.end(); ++it)
key_list.push_back( it->first);
***************
*** 508,513 ****
std::vector< RoleMapKey>::iterator key_it = key_list.begin();
! std::vector< RoleMapKey>::iterator key_en = key_list.end();
! for( ; key_it != key_en; ++key_it )
{
//RoleMapKey ptr = it->first;
--- 493,497 ----
std::vector< RoleMapKey>::iterator key_it = key_list.begin();
! for( ; key_it != key_list.end(); ++key_it )
{
//RoleMapKey ptr = it->first;
***************
*** 516,521 ****
RoleMapValue &roles = m_finalRoleMap[ ptr];
RoleSeries_Iterator jt = roles.begin();
! RoleSeries_Iterator je = roles.end();
! for( ; jt != je; ++jt)
if (!jt->getFCOPtr()->isAbstract())
{
--- 500,504 ----
RoleMapValue &roles = m_finalRoleMap[ ptr];
RoleSeries_Iterator jt = roles.begin();
! for( ; jt != roles.end(); ++jt)
if (!jt->getFCOPtr()->isAbstract())
{
***************
*** 555,560 ****
std::vector<std::string>::iterator sorted_list_it = role_lines_to_dump.begin();
! std::vector<std::string>::iterator sorted_list_en = role_lines_to_dump.end();
! for( ; sorted_list_it != sorted_list_en; ++sorted_list_it)
mmm += *sorted_list_it;
--- 538,542 ----
std::vector<std::string>::iterator sorted_list_it = role_lines_to_dump.begin();
! for( ; sorted_list_it != role_lines_to_dump.end(); ++sorted_list_it)
mmm += *sorted_list_it;
***************
*** 566,571 ****
std::sort( m_finalAspectList.begin(), m_finalAspectList.end(), asp_less_than);
std::vector<AspectRep *>::iterator asp_it = m_finalAspectList.begin();
! std::vector<AspectRep *>::iterator asp_en = m_finalAspectList.end();
! for( ; asp_it != asp_en; ++asp_it)
{
AspectRep * asp_ptr = *asp_it;
--- 548,552 ----
std::sort( m_finalAspectList.begin(), m_finalAspectList.end(), asp_less_than);
std::vector<AspectRep *>::iterator asp_it = m_finalAspectList.begin();
! for( ; asp_it != m_finalAspectList.end(); ++asp_it)
{
AspectRep * asp_ptr = *asp_it;
***************
*** 587,592 ****
const AspectRep::PartRepSeries parts = (*asp_it)->getPartSeries( this);
AspectRep::PartRepSeries_ConstIterator part_it = parts.begin();
! AspectRep::PartRepSeries_ConstIterator part_en = parts.end();
! for( ; part_it != part_en; ++part_it)
{
std::string r_name = part_it->getRoleRepPtr()->getSmartRoleName();
--- 568,572 ----
const AspectRep::PartRepSeries parts = (*asp_it)->getPartSeries( this);
AspectRep::PartRepSeries_ConstIterator part_it = parts.begin();
! for( ; part_it != parts.end(); ++part_it)
{
std::string r_name = part_it->getRoleRepPtr()->getSmartRoleName();
***************
*** 683,688 ****
{
RoleMap_ConstIterator it = m_initialRoleMap.begin();
! RoleMap_ConstIterator en = m_initialRoleMap.end();
! for ( ; it != en; ++it)
{
FCO * const ptr = it->first;
--- 663,667 ----
{
RoleMap_ConstIterator it = m_initialRoleMap.begin();
! for ( ; it != m_initialRoleMap.end(); ++it)
{
FCO * const ptr = it->first;
***************
*** 692,697 ****
RoleSeries_ConstIterator jt = it->second.begin();
! RoleSeries_ConstIterator je = it->second.end();
! for( ; jt != je ; ++jt)
//if (!jt->getFCOPtr()->isAbstract())
{
--- 671,675 ----
RoleSeries_ConstIterator jt = it->second.begin();
! for( ; jt != it->second.end(); ++jt)
//if (!jt->getFCOPtr()->isAbstract())
{
***************
*** 716,721 ****
std::vector<FCO*>::iterator desc_it = descendants.begin();
! std::vector<FCO*>::iterator desc_en = descendants.end();
! for( ; desc_it != desc_en; ++desc_it)
if ( !(*desc_it)->isAbstract())
str_expr_begin += "+ self.parts( \"" + (*desc_it)->getName() + r.getOnlyRoleName() + "\" ) -> size ";
--- 694,698 ----
std::vector<FCO*>::iterator desc_it = descendants.begin();
! for( ; desc_it != descendants.end(); ++desc_it)
if ( !(*desc_it)->isAbstract())
str_expr_begin += "+ self.parts( \"" + (*desc_it)->getName() + r.getOnlyRoleName() + "\" ) -> size ";
Index: ReferenceRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ReferenceRep.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ReferenceRep.cpp 26 Jan 2005 17:31:06 -0000 1.12
--- ReferenceRep.cpp 21 Jun 2005 17:16:46 -0000 1.13
***************
*** 193,198 ****
{
RefereeList_Iterator referee_it = referees.begin();
! RefereeList_Iterator referee_en = referees.end();
! for( ; referee_it != referee_en; ++referee_it)
{
addFinalReferees( *referee_it);
--- 193,197 ----
{
RefereeList_Iterator referee_it = referees.begin();
! for( ; referee_it != referees.end(); ++referee_it)
{
addFinalReferees( *referee_it);
***************
*** 209,214 ****
RefereeList_Iterator it = m_initialReferees.begin();
! RefereeList_Iterator en = m_initialReferees.end();
! for( ; it != en; ++it)
{
FCO * target_ptr = *it;
--- 208,212 ----
RefereeList_Iterator it = m_initialReferees.begin();
! for( ; it != m_initialReferees.end(); ++it)
{
FCO * target_ptr = *it;
***************
*** 265,270 ****
// copy if not present already into all_referees
RefereeList_ConstIterator list_iter = list.begin();
! RefereeList_ConstIterator list_iend = list.end();
! for( ; list_iter != list_iend; ++list_iter)
if (std::find( all_referees.begin(), all_referees.end(), *list_iter) == all_referees.end())
all_referees.push_back( *list_iter);
--- 263,267 ----
// copy if not present already into all_referees
RefereeList_ConstIterator list_iter = list.begin();
! for( ; list_iter != list.end(); ++list_iter)
if (std::find( all_referees.begin(), all_referees.end(), *list_iter) == all_referees.end())
all_referees.push_back( *list_iter);
***************
*** 315,320 ****
std::sort( m_finalReferees.begin(), m_finalReferees.end(), lex);
RefereeList_Iterator it = m_finalReferees.begin();
! RefereeList_Iterator en = m_finalReferees.end();
! for( ; it != en; ++it )
{
if (!(*it)->isAbstract())
--- 312,316 ----
std::sort( m_finalReferees.begin(), m_finalReferees.end(), lex);
RefereeList_Iterator it = m_finalReferees.begin();
! for( ; it != m_finalReferees.end(); ++it )
{
if (!(*it)->isAbstract())
***************
*** 394,399 ****
ModelRep::AspectRepPtrList::iterator asp_it = intersection_of_asps.begin();
! ModelRep::AspectRepPtrList::iterator asp_en = intersection_of_asps.end();
! for( ; asp_it != asp_en; ++asp_it)
{
if ( !lowest_asp) // is lowest_asp set?
--- 390,394 ----
ModelRep::AspectRepPtrList::iterator asp_it = intersection_of_asps.begin();
! for( ; asp_it != intersection_of_asps.end(); ++asp_it)
{
if ( !lowest_asp) // is lowest_asp set?
***************
*** 413,418 ****
std::vector<const ModelRep *> models = getModelRefVector();
std::vector<const ModelRep *>::iterator it = models.begin();
! std::vector<const ModelRep *>::iterator en = models.end();
! for( ; it != en; ++it)
{
const ModelRep::AspectRepPtrList &asplist = (*it)->getFinalAspectRepPtrList();
--- 408,412 ----
std::vector<const ModelRep *> models = getModelRefVector();
std::vector<const ModelRep *>::iterator it = models.begin();
! for( ; it != models.end(); ++it)
{
const ModelRep::AspectRepPtrList &asplist = (*it)->getFinalAspectRepPtrList();
***************
*** 425,430 ****
{
ModelRep::AspectRepPtrList::iterator isect_it = intersection_of_asps.begin();
! ModelRep::AspectRepPtrList::iterator isect_en = intersection_of_asps.end();
! while( isect_it != isect_en)
{
if ( std::find( asplist.begin(), asplist.end(), *isect_it) == asplist.end()) // element of union not found in asp set, so it should be deleted from the union
--- 419,423 ----
{
ModelRep::AspectRepPtrList::iterator isect_it = intersection_of_asps.begin();
! while( isect_it != intersection_of_asps.end())
{
if ( std::find( asplist.begin(), asplist.end(), *isect_it) == asplist.end()) // element of union not found in asp set, so it should be deleted from the union
Index: Sheet.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Sheet.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Sheet.cpp 26 Jan 2005 17:31:07 -0000 1.10
--- Sheet.cpp 21 Jun 2005 17:16:46 -0000 1.11
***************
*** 41,46 ****
{
FcoRep_Iterator it( m_fcoRepList.begin() );
! FcoRep_Iterator en( m_fcoRepList.end() );
! for( ; it != en; ++it)
{
FcoRep * act_ptr = * it;
--- 41,45 ----
{
FcoRep_Iterator it( m_fcoRepList.begin() );
! for( ; it != m_fcoRepList.end(); ++it)
{
FcoRep * act_ptr = * it;
***************
*** 50,55 ****
{
AtomRep_Iterator it = m_atomList.begin();
! AtomRep_Iterator en = m_atomList.end();
! for( ; it != en; ++it)
{
AtomRep * act_ptr = * it;
--- 49,53 ----
{
AtomRep_Iterator it = m_atomList.begin();
! for( ; it != m_atomList.end(); ++it)
{
AtomRep * act_ptr = * it;
***************
*** 59,64 ****
{
ModelRep_Iterator it = m_modelList.begin();
! ModelRep_Iterator en = m_modelList.end();
! for( ; it != en; ++it)
{
ModelRep * act_ptr = * it;
--- 57,61 ----
{
ModelRep_Iterator it = m_modelList.begin();
! for( ; it != m_modelList.end(); ++it)
{
ModelRep * act_ptr = * it;
***************
*** 68,73 ****
{
ConnectionRep_Iterator it = m_connList.begin();
! ConnectionRep_Iterator en = m_connList.end();
! for( ; it != en; ++it)
{
ConnectionRep * act_ptr = * it;
--- 65,69 ----
{
ConnectionRep_Iterator it = m_connList.begin();
! for( ; it != m_connList.end(); ++it)
{
ConnectionRep * act_ptr = * it;
***************
*** 77,82 ****
{
SetRep_Iterator it = m_setList.begin();
! SetRep_Iterator en = m_setList.end();
! for( ; it != en; ++it)
{
SetRep * act_ptr = * it;
--- 73,77 ----
{
SetRep_Iterator it = m_setList.begin();
! for( ; it != m_setList.end(); ++it)
{
SetRep * act_ptr = * it;
***************
*** 86,91 ****
{
ReferenceRep_Iterator it = m_refList.begin();
! ReferenceRep_Iterator en = m_refList.end();
! for( ; it != en; ++it)
{
ReferenceRep * act_ptr = * it;
--- 81,85 ----
{
ReferenceRep_Iterator it = m_refList.begin();
! for( ; it != m_refList.end(); ++it)
{
ReferenceRep * act_ptr = * it;
***************
*** 95,100 ****
{
FolderRep_Iterator ai = m_folderList.begin();
! FolderRep_Iterator ae = m_folderList.end();
! for( ; ai != ae; ++ai)
{
FolderRep * act_ptr = * ai;
--- 89,93 ----
{
FolderRep_Iterator ai = m_folderList.begin();
! for( ; ai != m_folderList.end(); ++ai)
{
FolderRep * act_ptr = * ai;
***************
*** 104,109 ****
{
AspectRep_Iterator ai = m_aspectList.begin();
! AspectRep_Iterator ae = m_aspectList.end();
! for( ; ai != ae; ++ai)
{
AspectRep * act_ptr = * ai;
--- 97,101 ----
{
AspectRep_Iterator ai = m_aspectList.begin();
! for( ; ai != m_aspectList.end(); ++ai)
{
AspectRep * act_ptr = * ai;
***************
*** 113,118 ****
{
ConstraintRep_Iterator ai = m_constraintList.begin();
! ConstraintRep_Iterator ae = m_constraintList.end();
! for( ; ai != ae; ++ai)
{
ConstraintRep * act_ptr = * ai;
--- 105,109 ----
{
ConstraintRep_Iterator ai = m_constraintList.begin();
! for( ; ai != m_constraintList.end(); ++ai)
{
ConstraintRep * act_ptr = * ai;
***************
*** 122,127 ****
{
ConstraintFuncRep_Iterator ai = m_constraintFuncList.begin();
! ConstraintFuncRep_Iterator ae = m_constraintFuncList.end();
! for( ; ai != ae; ++ai)
{
ConstraintFuncRep * act_ptr = * ai;
--- 113,117 ----
{
ConstraintFuncRep_Iterator ai = m_constraintFuncList.begin();
! for( ; ai != m_constraintFuncList.end(); ++ai)
{
ConstraintFuncRep * act_ptr = * ai;
***************
*** 131,136 ****
{
AttributeRep_Iterator ai = m_attributeList.begin();
! AttributeRep_Iterator ae = m_attributeList.end();
! for( ; ai != ae; ++ai)
{
AttributeRep * act_ptr = * ai;
--- 121,125 ----
{
AttributeRep_Iterator ai = m_attributeList.begin();
! for( ; ai != m_attributeList.end(); ++ai)
{
AttributeRep * act_ptr = * ai;
***************
*** 198,203 ****
{
{FcoRep_Iterator it0( m_fcoRepList.begin());
! FcoRep_Iterator en0( m_fcoRepList.end());
! for( ; it0 != en0; ++it0 )
{
(*it0)->initAttributes();
--- 187,191 ----
{
{FcoRep_Iterator it0( m_fcoRepList.begin());
! for( ; it0 != m_fcoRepList.end(); ++it0 )
{
(*it0)->initAttributes();
***************
*** 206,211 ****
{AtomRep_Iterator it1 = m_atomList.begin();
! AtomRep_Iterator en1 = m_atomList.end();
! for( ; it1 != en1; ++it1 )
{
(*it1)->initAttributes();
--- 194,198 ----
{AtomRep_Iterator it1 = m_atomList.begin();
! for( ; it1 != m_atomList.end(); ++it1 )
{
(*it1)->initAttributes();
***************
*** 214,219 ****
{ModelRep_Iterator it2 = m_modelList.begin();
! ModelRep_Iterator en2 = m_modelList.end();
! for( ; it2 != en2; ++it2 )
{
(*it2)->initAttributes();
--- 201,205 ----
{ModelRep_Iterator it2 = m_modelList.begin();
! for( ; it2 != m_modelList.end(); ++it2 )
{
(*it2)->initAttributes();
***************
*** 222,227 ****
{ConnectionRep_Iterator it3 = m_connList.begin();
! ConnectionRep_Iterator en3 = m_connList.end();
! for( ; it3 != en3; ++it3 )
{
(*it3)->initAttributes();
--- 208,212 ----
{ConnectionRep_Iterator it3 = m_connList.begin();
! for( ; it3 != m_connList.end(); ++it3 )
{
(*it3)->initAttributes();
***************
*** 230,235 ****
{SetRep_Iterator it4 = m_setList.begin();
! SetRep_Iterator en4 = m_setList.end();
! for( ; it4 != en4; ++it4 )
{
(*it4)->initAttributes();
--- 215,219 ----
{SetRep_Iterator it4 = m_setList.begin();
! for( ; it4 != m_setList.end(); ++it4 )
{
(*it4)->initAttributes();
***************
*** 238,243 ****
{ReferenceRep_Iterator it5 = m_refList.begin();
! ReferenceRep_Iterator en5 = m_refList.end();
! for( ; it5 != en5; ++it5 )
{
(*it5)->initAttributes();
--- 222,226 ----
{ReferenceRep_Iterator it5 = m_refList.begin();
! for( ; it5 != m_refList.end(); ++it5 )
{
(*it5)->initAttributes();
***************
*** 246,251 ****
{FolderRep_Iterator it6 = m_folderList.begin();
! FolderRep_Iterator en6 = m_folderList.end();
! for( ; it6 != en6; ++it6 )
{
(*it6)->initAttributes();
--- 229,233 ----
{FolderRep_Iterator it6 = m_folderList.begin();
! for( ; it6 != m_folderList.end(); ++it6 )
{
(*it6)->initAttributes();
***************
*** 258,263 ****
{
ModelRep_Iterator jt1( m_modelList.begin());
! ModelRep_Iterator je1( m_modelList.end());
! for( ; jt1 != je1; ++jt1)
{
ModelRep * mod_ptr = *jt1;
--- 240,244 ----
{
ModelRep_Iterator jt1( m_modelList.begin());
! for( ; jt1 != m_modelList.end(); ++jt1)
{
ModelRep * mod_ptr = *jt1;
***************
*** 449,454 ****
{
FcoRep_Iterator it0( m_fcoRepList.begin());
! FcoRep_Iterator en0( m_fcoRepList.end());
! for( ; it0 != en0; ++it0 )
{
if ((*it0)->getPtr() == ptr) return *it0;
--- 430,434 ----
{
FcoRep_Iterator it0( m_fcoRepList.begin());
! for( ; it0 != m_fcoRepList.end(); ++it0 )
{
if ((*it0)->getPtr() == ptr) return *it0;
***************
*** 456,461 ****
AtomRep_Iterator it1 = m_atomList.begin();
! AtomRep_Iterator en1 = m_atomList.end();
! for( ; it1 != en1; ++it1 )
{
if ((*it1)->getPtr() == ptr) return *it1;
--- 436,440 ----
AtomRep_Iterator it1 = m_atomList.begin();
! for( ; it1 != m_atomList.end(); ++it1 )
{
if ((*it1)->getPtr() == ptr) return *it1;
***************
*** 463,468 ****
ModelRep_Iterator it2 = m_modelList.begin();
! ModelRep_Iterator en2 = m_modelList.end();
! for( ; it2 != en2; ++it2 )
{
if ((*it2)->getPtr() == ptr) return *it2;
--- 442,446 ----
ModelRep_Iterator it2 = m_modelList.begin();
! for( ; it2 != m_modelList.end(); ++it2 )
{
if ((*it2)->getPtr() == ptr) return *it2;
***************
*** 470,475 ****
ConnectionRep_Iterator it3 = m_connList.begin();
! ConnectionRep_Iterator en3 = m_connList.end();
! for( ; it3 != en3; ++it3 )
{
if ((*it3)->getPtr() == ptr) return *it3;
--- 448,452 ----
ConnectionRep_Iterator it3 = m_connList.begin();
! for( ; it3 != m_connList.end(); ++it3 )
{
if ((*it3)->getPtr() == ptr) return *it3;
***************
*** 477,482 ****
SetRep_Iterator it4 = m_setList.begin();
! SetRep_Iterator en4 = m_setList.end();
! for( ; it4 != en4; ++it4 )
{
if ((*it4)->getPtr() == ptr) return *it4;
--- 454,458 ----
SetRep_Iterator it4 = m_setList.begin();
! for( ; it4 != m_setList.end(); ++it4 )
{
if ((*it4)->getPtr() == ptr) return *it4;
***************
*** 484,489 ****
ReferenceRep_Iterator it5 = m_refList.begin();
! ReferenceRep_Iterator en5 = m_refList.end();
! for( ; it5 != en5; ++it5 )
{
if ((*it5)->getPtr() == ptr) return *it5;
--- 460,464 ----
ReferenceRep_Iterator it5 = m_refList.begin();
! for( ; it5 != m_refList.end(); ++it5 )
{
if ((*it5)->getPtr() == ptr) return *it5;
***************
*** 496,501 ****
{
ReferenceRep_Iterator it( m_refList.begin());
! ReferenceRep_Iterator en( m_refList.end());
! for( ; it != en; ++it )
{
if ((*it)->getPtr() == ptr) return *it;
--- 471,475 ----
{
ReferenceRep_Iterator it( m_refList.begin());
! for( ; it != m_refList.end(); ++it )
{
if ((*it)->getPtr() == ptr) return *it;
***************
*** 509,514 ****
{
FolderRep_Iterator it5 = m_folderList.begin();
! FolderRep_Iterator en5 = m_folderList.end();
! for( ; it5 != en5; ++it5 )
{
if ((*it5)->getPtr() == ptr) return *it5;
--- 483,487 ----
{
FolderRep_Iterator it5 = m_folderList.begin();
! for( ; it5 != m_folderList.end(); ++it5 )
{
if ((*it5)->getPtr() == ptr) return *it5;
***************
*** 516,521 ****
AspectRep_Iterator it1( m_aspectList.begin());
! AspectRep_Iterator en1( m_aspectList.end());
! for( ; it1 != en1; ++it1 )
{
if ((*it1)->getPtr() == ptr) return *it1;
--- 489,493 ----
AspectRep_Iterator it1( m_aspectList.begin());
! for( ; it1 != m_aspectList.end(); ++it1 )
{
if ((*it1)->getPtr() == ptr) return *it1;
***************
*** 523,528 ****
ConstraintRep_Iterator it2 = m_constraintList.begin();
! ConstraintRep_Iterator en2 = m_constraintList.end();
! for( ; it2 != en2; ++it2 )
{
if ((*it2)->getPtr() == ptr) return *it2;
--- 495,499 ----
ConstraintRep_Iterator it2 = m_constraintList.begin();
! for( ; it2 != m_constraintList.end(); ++it2 )
{
if ((*it2)->getPtr() == ptr) return *it2;
***************
*** 530,535 ****
ConstraintFuncRep_Iterator it3 = m_constraintFuncList.begin();
! ConstraintFuncRep_Iterator en3 = m_constraintFuncList.end();
! for( ; it3 != en3; ++it3 )
{
if ((*it3)->getPtr() == ptr) return *it3;
--- 501,505 ----
ConstraintFuncRep_Iterator it3 = m_constraintFuncList.begin();
! for( ; it3 != m_constraintFuncList.end(); ++it3 )
{
if ((*it3)->getPtr() == ptr) return *it3;
***************
*** 537,542 ****
AttributeRep_Iterator it4 = m_attributeList.begin();
! AttributeRep_Iterator en4 = m_attributeList.end();
! for( ; it4 != en4; ++it4 )
{
if ((*it4)->getPtr() == ptr) return *it4;
--- 507,511 ----
AttributeRep_Iterator it4 = m_attributeList.begin();
! for( ; it4 != m_attributeList.end(); ++it4 )
{
if ((*it4)->getPtr() == ptr) return *it4;
***************
*** 596,601 ****
unsigned int val = 0;
std::map<unsigned int,unsigned int>::iterator i = t_m.begin();
! std::map<unsigned int,unsigned int>::iterator e = t_m.end();
! for( ; i != e; ++i)
{
++val;
--- 565,569 ----
unsigned int val = 0;
std::map<unsigned int,unsigned int>::iterator i = t_m.begin();
! for( ; i != t_m.end(); ++i)
{
++val;
***************
*** 722,727 ****
// using the ancestors database build up the m_desc and m_anc fields of each fco
std::map< unsigned int, std::vector<unsigned int> >::iterator anc_it = ancestors.begin();
! std::map< unsigned int, std::vector<unsigned int> >::iterator anc_en = ancestors.end();
! for( ; anc_it != anc_en; ++anc_it)
{
unsigned int id = anc_it->first;
--- 690,694 ----
// using the ancestors database build up the m_desc and m_anc fields of each fco
std::map< unsigned int, std::vector<unsigned int> >::iterator anc_it = ancestors.begin();
! for( ; anc_it != ancestors.end(); ++anc_it)
{
unsigned int id = anc_it->first;
Index: Any.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Any.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Any.cpp 7 Apr 2005 21:26:24 -0000 1.13
--- Any.cpp 21 Jun 2005 17:16:46 -0000 1.14
***************
*** 70,75 ****
// try to find one among the equivalent classes which is in the root folder
std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! std::set< BON::FCO >::const_iterator en = m_equivs.end();
! for ( ; !m_isInRootFolder && it != en; ++it)
{
if ( *it == m_ptr) continue;
--- 70,74 ----
// try to find one among the equivalent classes which is in the root folder
std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! for ( ; !m_isInRootFolder && it != m_equivs.end(); ++it)
{
if ( *it == m_ptr) continue;
***************
*** 264,269 ****
{
ConstraintRepPtrList_ConstIterator it = list.begin();
! ConstraintRepPtrList_ConstIterator en = list.end();
! for( ; it != en; ++it)
addFinalConstraint( *it);
}
--- 263,267 ----
{
ConstraintRepPtrList_ConstIterator it = list.begin();
! for( ; it != list.end(); ++it)
addFinalConstraint( *it);
}
***************
*** 279,284 ****
ConstraintRepPtrList_ConstIterator c_i = m_finalConstraintList.begin();
! ConstraintRepPtrList_ConstIterator c_e = m_finalConstraintList.end();
! for( ; c_i != c_e; ++c_i)
{
mmm += ( *c_i)->doDump();
--- 277,281 ----
ConstraintRepPtrList_ConstIterator c_i = m_finalConstraintList.begin();
! for( ; c_i != m_finalConstraintList.end(); ++c_i)
{
mmm += ( *c_i)->doDump();
Index: FCO.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/FCO.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FCO.cpp 7 Apr 2005 21:26:24 -0000 1.13
--- FCO.cpp 21 Jun 2005 17:16:46 -0000 1.14
***************
*** 207,212 ****
// abstract iff all equivalent classes are abstract
std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! std::set< BON::FCO >::const_iterator en = m_equivs.end();
! for ( ; it != en; ++it)
{
if ( *it == m_ptr) continue;
--- 207,211 ----
// abstract iff all equivalent classes are abstract
std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! for ( ; it != m_equivs.end(); ++it)
{
if ( *it == m_ptr) continue;
***************
*** 456,461 ****
std::vector<ReferenceRep *>::iterator temp_it = temp.begin();
! std::vector<ReferenceRep *>::iterator temp_en = temp.end();
! for( ; temp_it != temp_en; ++temp_it)
{
if( std::find( multiple_refs.begin(), multiple_refs.end(), *temp_it) == multiple_refs.end()) // not found a ref in the current transitive ref list
--- 455,459 ----
std::vector<ReferenceRep *>::iterator temp_it = temp.begin();
! for( ; temp_it != temp.end(); ++temp_it)
{
if( std::find( multiple_refs.begin(), multiple_refs.end(), *temp_it) == multiple_refs.end()) // not found a ref in the current transitive ref list
***************
*** 618,623 ****
{
AttributeRepPtrList_ConstIterator it_pos = t_list.begin();
! AttributeRepPtrList_ConstIterator en_pos = t_list.end();
! for( ; it_pos != en_pos; ++it_pos)
addFinalAttribute( *it_pos);
}
--- 616,620 ----
{
AttributeRepPtrList_ConstIterator it_pos = t_list.begin();
! for( ; it_pos != t_list.end(); ++it_pos)
addFinalAttribute( *it_pos);
}
***************
*** 625,634 ****
bool FCO::findFinalAttributeBasedOnName( const std::string & name)
{
! AttributeRepPtrList_Iterator it, en;
it = m_finalAttributeList.begin();
! en = m_finalAttributeList.end();
! while( it != en && !((*it)->getName() == name /*&& (*it)->isViewable()*/))
++it;
! return ( it != en); // if found
}
--- 622,630 ----
bool FCO::findFinalAttributeBasedOnName( const std::string & name)
{
! AttributeRepPtrList_Iterator it;
it = m_finalAttributeList.begin();
! while( it != m_finalAttributeList.end() && !((*it)->getName() == name /*&& (*it)->isViewable()*/))
++it;
! return ( it != m_finalAttributeList.end()); // if found
}
***************
*** 638,642 ****
{
std::string mmm = "";
! AttributeRepPtrList_Iterator it, en;
AnyLexicographicSort lex;
--- 634,638 ----
{
std::string mmm = "";
! AttributeRepPtrList_Iterator it;
AnyLexicographicSort lex;
***************
*** 645,650 ****
it = m_finalAttributeList.begin();
! en = m_finalAttributeList.end();
! for( ; it != en; ++it)
if ( !(*it)->isGlobal())
{
--- 641,645 ----
it = m_finalAttributeList.begin();
! for( ; it != m_finalAttributeList.end(); ++it)
if ( !(*it)->isGlobal())
{
***************
*** 664,675 ****
{
std::list<AttributeRep*> temp_list;
! std::list<AttributeRep*>::iterator t_it, t_en;
std::string mmm = "";
! AttributeRepPtrList_Iterator it, en;
it = m_finalAttributeList.begin();
! en = m_finalAttributeList.end();
! for( ; it != en; ++it)
if ( !check_viewable || (*it)->isViewable())
{
--- 659,669 ----
{
std::list<AttributeRep*> temp_list;
! std::list<AttributeRep*>::iterator t_it;
std::string mmm = "";
! AttributeRepPtrList_Iterator it;
it = m_finalAttributeList.begin();
! for( ; it != m_finalAttributeList.end(); ++it)
if ( !check_viewable || (*it)->isViewable())
{
***************
*** 683,688 ****
{
mmm = " attributes = \"";
! t_en = temp_list.end();
! for( t_it = temp_list.begin(); t_it != t_en; ++t_it)
{
if (t_it != temp_list.begin()) mmm += " ";
--- 677,681 ----
{
mmm = " attributes = \"";
! for( t_it = temp_list.begin(); t_it != temp_list.end(); ++t_it)
{
if (t_it != temp_list.begin()) mmm += " ";
***************
*** 701,706 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpIcon();
--- 694,698 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpIcon();
***************
*** 724,729 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpPortIcon();
--- 716,720 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpPortIcon();
***************
*** 747,752 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpDecorator();
--- 738,742 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpDecorator();
***************
*** 771,776 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpHotspotEnabled();
--- 761,765 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpHotspotEnabled();
***************
*** 794,799 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpTypeShown();
--- 783,787 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpTypeShown();
***************
*** 816,821 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpGeneralPref();
--- 804,808 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpGeneralPref();
***************
*** 903,908 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpSubTypeIcon();
--- 890,894 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpSubTypeIcon();
***************
*** 926,931 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpInstanceIcon();
--- 912,916 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpInstanceIcon();
***************
*** 949,954 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpNameWrap();
--- 934,938 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpNameWrap();
***************
*** 974,979 ****
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! std::vector<FCO*>::iterator en = ancestors.end();
! for( ; it != en; ++it)
{
mmm += (*it)->dumpNameEnabled();
--- 958,962 ----
getImpAncestors( ancestors);
std::vector<FCO*>::iterator it = ancestors.begin();
! for( ; it != ancestors.end(); ++it)
{
mmm += (*it)->dumpNameEnabled();
Index: RootFolder.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/RootFolder.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RootFolder.cpp 26 Jan 2005 17:31:06 -0000 1.4
--- RootFolder.cpp 21 Jun 2005 17:16:46 -0000 1.5
***************
*** 42,51 ****
std::sort( m_subFolderList.begin(), m_subFolderList.end(), lex);
SubFolder_ConstIterator it_f = m_subFolderList.begin();
! SubFolder_ConstIterator en_f = m_subFolderList.end();
! if ( it_f != en_f)
{
mmm +=" subfolders = \"";
bool first = true;
! while( it_f != en_f)
{
if (!first) mmm += " ";
--- 42,50 ----
std::sort( m_subFolderList.begin(), m_subFolderList.end(), lex);
SubFolder_ConstIterator it_f = m_subFolderList.begin();
! if ( it_f != m_subFolderList.end())
{
mmm +=" subfolders = \"";
bool first = true;
! while( it_f != m_subFolderList.end())
{
if (!first) mmm += " ";
***************
*** 64,69 ****
bool first = true;
FCO_ConstIterator it = m_fcoList.begin();
! FCO_ConstIterator en = m_fcoList.end();
! while ( it != en)
{
if ((*it)->isFCO() && !(*it)->isAbstract())
--- 63,67 ----
bool first = true;
FCO_ConstIterator it = m_fcoList.begin();
! while ( it != m_fcoList.end())
{
if ((*it)->isFCO() && !(*it)->isAbstract())
Index: Broker.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Broker.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Broker.cpp 26 Jan 2005 17:31:06 -0000 1.8
--- Broker.cpp 21 Jun 2005 17:16:46 -0000 1.9
***************
*** 102,107 ****
std::set<BON::RegistryNode> children = reg_node->getChildren();
std::set<BON::RegistryNode>::iterator c_it = children.begin();
! std::set<BON::RegistryNode>::iterator c_en = children.end();
! for(; c_it != c_en; ++c_it)
initFromRegistry( obj, folder, *c_it);
}
--- 102,106 ----
std::set<BON::RegistryNode> children = reg_node->getChildren();
std::set<BON::RegistryNode>::iterator c_it = children.begin();
! for(; c_it != children.end(); ++c_it)
initFromRegistry( obj, folder, *c_it);
}
***************
*** 115,120 ****
MetaRefDB_Iterator it = m_metaRefDB.begin();
! MetaRefDB_Iterator en = m_metaRefDB.end();
! for( ; it != en; ++it)
{
MetaRefNode node = *it;
--- 114,118 ----
MetaRefDB_Iterator it = m_metaRefDB.begin();
! for( ; it != m_metaRefDB.end(); ++it)
{
MetaRefNode node = *it;
Index: SetRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/SetRep.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SetRep.cpp 26 Jan 2005 17:31:07 -0000 1.7
--- SetRep.cpp 21 Jun 2005 17:16:46 -0000 1.8
***************
*** 59,64 ****
{
RoleRep::RoleRepSeries_ConstIterator role_it = role_series.begin();
! RoleRep::RoleRepSeries_ConstIterator role_en = role_series.end();
! for( ; role_it != role_en; ++role_it)
addSetMemberRole( model, *role_it);
}
--- 59,63 ----
{
RoleRep::RoleRepSeries_ConstIterator role_it = role_series.begin();
! for( ; role_it != role_series.end(); ++role_it)
addSetMemberRole( model, *role_it);
}
***************
*** 89,95 ****
ModelRepPtrList models = this->modelsIAmPartOfFinal();
ModelRepPtrList_Iterator mod_it = models.begin();
- ModelRepPtrList_Iterator mod_en = models.end();
// for all models that contain this set
! for( ; mod_it != mod_en; ++mod_it )
{
ModelRep* mod_ptr = *mod_it;
--- 88,93 ----
ModelRepPtrList models = this->modelsIAmPartOfFinal();
ModelRepPtrList_Iterator mod_it = models.begin();
// for all models that contain this set
! for( ; mod_it != models.end(); ++mod_it )
{
ModelRep* mod_ptr = *mod_it;
***************
*** 100,105 ****
// for all members of the set
SetMemberList_ConstIterator member_it = m_memberList.begin();
! SetMemberList_ConstIterator member_en = m_memberList.end();
! for( ; member_it != member_en; ++member_it)
{
FCO * member_ptr = *member_it;
--- 98,102 ----
// for all members of the set
SetMemberList_ConstIterator member_it = m_memberList.begin();
! for( ; member_it != m_memberList.end(); ++member_it)
{
FCO * member_ptr = *member_it;
***************
*** 180,187 ****
ModelRepPtrList models = this->modelsIAmPartOfFinal();
ModelRepPtrList_ConstIterator mod_it = models.begin();
- ModelRepPtrList_ConstIterator mod_en = models.end();
// for all models that contain this set
! for( ; mod_it != mod_en; ++mod_it )
{
ModelRep * mod_ptr = *mod_it;
--- 177,183 ----
ModelRepPtrList models = this->modelsIAmPartOfFinal();
ModelRepPtrList_ConstIterator mod_it = models.begin();
// for all models that contain this set
! for( ; mod_it != models.end(); ++mod_it )
{
ModelRep * mod_ptr = *mod_it;
***************
*** 189,194 ****
// for all members in this model
PointerItemSeries_Iterator part_it = m_memberMap[ mod_ptr].begin();
! PointerItemSeries_Iterator part_en = m_memberMap[ mod_ptr].end();
! for( ; part_it != part_en; ++part_it)
{
// insert into dumper_list if not present already
--- 185,189 ----
// for all members in this model
PointerItemSeries_Iterator part_it = m_memberMap[ mod_ptr].begin();
! for( ; part_it != m_memberMap[ mod_ptr].end(); ++part_it)
{
// insert into dumper_list if not present already
***************
*** 204,209 ****
std::sort( dumper_list.begin(), dumper_list.end(), lex);
PointerItemSeries_Iterator dump_it = dumper_list.begin();
! PointerItemSeries_Iterator dump_en = dumper_list.end();
! for( ; dump_it != dump_en; ++dump_it)
mmm += indStr() + "<pointeritem desc = \"" + dump_it->name() + "\"></pointeritem>\n";
--- 199,203 ----
std::sort( dumper_list.begin(), dumper_list.end(), lex);
PointerItemSeries_Iterator dump_it = dumper_list.begin();
! for( ; dump_it != dumper_list.end(); ++dump_it)
mmm += indStr() + "<pointeritem desc = \"" + dump_it->name() + "\"></pointeritem>\n";
Index: ConnJoint.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ConnJoint.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ConnJoint.cpp 26 Jan 2005 17:31:06 -0000 1.11
--- ConnJoint.cpp 21 Jun 2005 17:16:46 -0000 1.12
***************
*** 135,140 ****
{
RoleRep::RoleRepSeries_ConstIterator r_it = new_role_series.begin();
! RoleRep::RoleRepSeries_ConstIterator r_en = new_role_series.end();
! for( ; r_it != r_en; ++r_it)
addTargetItem( i, model, *r_it);
}
--- 135,139 ----
{
RoleRep::RoleRepSeries_ConstIterator r_it = new_role_series.begin();
! for( ; r_it != new_role_series.end(); ++r_it)
addTargetItem( i, model, *r_it);
}
***************
*** 156,167 ****
std::vector<ReferenceRep*> inner_modelreferences = mod_ptr->getInnerModelReferencesFinal();
std::vector<ReferenceRep*>::iterator model_ref_it = inner_modelreferences.begin();
! std::vector<ReferenceRep*>::iterator model_ref_en = inner_modelreferences.end();
! for( ; model_ref_it != model_ref_en; ++model_ref_it)
{
std::string m_r_n = (*model_ref_it)->getName();//t
std::vector<const ModelRep *> models_ref_refers = (*model_ref_it)->getModelRefVector(); // all models the reference refers to
std::vector<const ModelRep *>::iterator ref_model_it = models_ref_refers.begin();
! std::vector<const ModelRep *>::iterator ref_model_en = models_ref_refers.end();
! for( ; ref_model_it != ref_model_en; ++ref_model_it)
{
std::string r_m_n = (*ref_model_it)->getName();
--- 155,164 ----
std::vector<ReferenceRep*> inner_modelreferences = mod_ptr->getInnerModelReferencesFinal();
std::vector<ReferenceRep*>::iterator model_ref_it = inner_modelreferences.begin();
! for( ; model_ref_it != inner_modelreferences.end(); ++model_ref_it)
{
std::string m_r_n = (*model_ref_it)->getName();//t
std::vector<const ModelRep *> models_ref_refers = (*model_ref_it)->getModelRefVector(); // all models the reference refers to
std::vector<const ModelRep *>::iterator ref_model_it = models_ref_refers.begin();
! for( ; ref_model_it != models_ref_refers.end(); ++ref_model_it)
{
std::string r_m_n = (*ref_model_it)->getName();
***************
*** 210,215 ****
std::vector<const ModelRep*>::iterator sub_mod_it = inner_models.begin();
! std::vector<const ModelRep*>::iterator sub_mod_en = inner_models.end();
! for(; sub_mod_it != sub_mod_en; ++sub_mod_it)
{
const ModelRep * sub_model = *sub_mod_it;
--- 207,211 ----
std::vector<const ModelRep*>::iterator sub_mod_it = inner_models.begin();
! for(; sub_mod_it != inner_models.end(); ++sub_mod_it)
{
const ModelRep * sub_model = *sub_mod_it;
***************
*** 219,224 ****
bool has_some = sub_model->getFinalRoles( fco, roles_in_sub_model);
RoleRep::RoleRepSeries_ConstIterator r_it = roles_in_sub_model.begin();
! RoleRep::RoleRepSeries_ConstIterator r_en = roles_in_sub_model.end();
! for( ; has_some && r_it != r_en; ++r_it) // if (!roles_in_sub_model.empty())
{
RoleRep sub_role = *r_it; //TOF(" pe sub_role: " + sub_role.getSmartRoleName() + " in " + sub_model->getName());
--- 215,219 ----
bool has_some = sub_model->getFinalRoles( fco, roles_in_sub_model);
RoleRep::RoleRepSeries_ConstIterator r_it = roles_in_sub_model.begin();
! for( ; has_some && r_it != roles_in_sub_model.end(); ++r_it) // if (!roles_in_sub_model.empty())
{
RoleRep sub_role = *r_it; //TOF(" pe sub_role: " + sub_role.getSmartRoleName() + " in " + sub_model->getName());
***************
*** 232,237 ****
bool has_some_subm = mod_ptr->getFinalRoles( sub_model, sub_model_roles_in_model ); // if the model contains sub_model with some roles
RoleRep::RoleRepSeries_ConstIterator r_it_sm = sub_model_roles_in_model.begin();
! RoleRep::RoleRepSeries_ConstIterator r_en_sm = sub_model_roles_in_model.end();
! for( ; has_some_subm && r_it_sm != r_en_sm; ++r_it_sm )
{
std::string desc_sub_model_role_name = r_it_sm->getSmartRoleName();
--- 227,231 ----
bool has_some_subm = mod_ptr->getFinalRoles( sub_model, sub_model_roles_in_model ); // if the model contains sub_model with some roles
RoleRep::RoleRepSeries_ConstIterator r_it_sm = sub_model_roles_in_model.begin();
! for( ; has_some_subm && r_it_sm != sub_model_roles_in_model.end(); ++r_it_sm )
{
std::string desc_sub_model_role_name = r_it_sm->getSmartRoleName();
***************
*** 242,247 ****
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();
! FCO::ReferenceRepList_ConstIterator ref_en = ref_list.end();
! for( ; ref_it != ref_en; ++ref_it)
{
if( !(*ref_it)->isAbstract() && (*ref_it)->amIPartOfFinal( mod_ptr) ) // if model may contain the reference
--- 236,240 ----
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)
{
if( !(*ref_it)->isAbstract() && (*ref_it)->amIPartOfFinal( mod_ptr) ) // if model may contain the reference
***************
*** 250,255 ****
bool ref_has_roles = mod_ptr->getFinalRoles( *ref_it, sub_ref_roles_in_model ); // if the model contains reference with some roles
RoleRep::RoleRepSeries_ConstIterator r_it_ref = sub_ref_roles_in_model.begin();
! RoleRep::RoleRepSeries_ConstIterator r_en_ref = sub_ref_roles_in_model.end();
! for( ; ref_has_roles && r_it_ref != r_en_ref; ++r_it_ref )
{
std::string desc_sub_ref_role_name = r_it_ref->getSmartRoleName();
--- 243,247 ----
bool ref_has_roles = mod_ptr->getFinalRoles( *ref_it, sub_ref_roles_in_model ); // if the model contains reference with some roles
RoleRep::RoleRepSeries_ConstIterator r_it_ref = sub_ref_roles_in_model.begin();
! for( ; ref_has_roles && r_it_ref != sub_ref_roles_in_model.end(); ++r_it_ref )
{
std::string desc_sub_ref_role_name = r_it_ref->getSmartRoleName();
***************
*** 311,322 ****
FCO::ModelRepPtrList_ConstIterator mod_it = model_list.begin();
- FCO::ModelRepPtrList_ConstIterator mod_en = model_list.end();
// for all models i am part of
! for( ; mod_it != mod_en; ++mod_it )
{
ModelRep * mod_ptr = *mod_it;
PointerItemSeries_Iterator item_it = m_oper1TargetMap[ mod_ptr].begin();
! PointerItemSeries_Iterator item_en = m_oper1TargetMap[ mod_ptr].end();
! for( ; item_it != item_en; ++item_it)
{
if ( std::find( src_dumper_list.begin(), src_dumper_list.end(), *item_it) ==
--- 303,312 ----
FCO::ModelRepPtrList_ConstIterator mod_it = model_list.begin();
// for all models i am part of
! for( ; mod_it != model_list.end(); ++mod_it )
{
ModelRep * mod_ptr = *mod_it;
PointerItemSeries_Iterator item_it = m_oper1TargetMap[ mod_ptr].begin();
! for( ; item_it != m_oper1TargetMap[ mod_ptr].end(); ++item_it)
{
if ( std::find( src_dumper_list.begin(), src_dumper_list.end(), *item_it) ==
***************
*** 328,333 ****
item_it = m_oper2TargetMap[ mod_ptr].begin();
! item_en = m_oper2TargetMap[ mod_ptr].end();
! for( ; item_it != item_en; ++item_it)
{
if ( std::find( dst_dumper_list.begin(), dst_dumper_list.end(), *item_it) ==
--- 318,322 ----
item_it = m_oper2TargetMap[ mod_ptr].begin();
! for( ; item_it != m_oper2TargetMap[ mod_ptr].end(); ++item_it)
{
if ( std::find( dst_dumper_list.begin(), dst_dumper_list.end(), *item_it) ==
***************
*** 350,355 ****
PointerItemSeries_Iterator item_it = src_dumper_list.begin();
! PointerItemSeries_Iterator item_en = src_dumper_list.end();
! for( ; item_it != item_en; ++item_it)
mmm_src += indStr() + "<pointeritem desc = \"" + item_it->name() + "\"></pointeritem>\n";
--- 339,343 ----
PointerItemSeries_Iterator item_it = src_dumper_list.begin();
! for( ; item_it != src_dumper_list.end(); ++item_it)
mmm_src += indStr() + "<pointeritem desc = \"" + item_it->name() + "\"></pointeritem>\n";
***************
*** 360,365 ****
item_it = dst_dumper_list.begin();
! item_en = dst_dumper_list.end();
! for( ; item_it != item_en; ++item_it)
mmm_dst += indStr() + "<pointeritem desc = \"" + item_it->name() + "\"></pointeritem>\n";
--- 348,352 ----
item_it = dst_dumper_list.begin();
! for( ; item_it != dst_dumper_list.end(); ++item_it)
mmm_dst += indStr() + "<pointeritem desc = \"" + item_it->name() + "\"></pointeritem>\n";
***************
*** 430,435 ****
// assign the source cardinality constraints to DST-s
SDList_Iterator it = m_oper2.begin();
! SDList_Iterator en = m_oper2.end();
! while ( it != en)
{
std::string src_desc;
--- 417,421 ----
// assign the source cardinality constraints to DST-s
SDList_Iterator it = m_oper2.begin();
! while ( it != m_oper2.end())
{
std::string src_desc;
***************
*** 454,459 ****
// assign the dst cardinality constraints to SRC-s
SDList_Iterator it = m_oper1.begin();
! SDList_Iterator en = m_oper1.end();
! while ( it != en)
{
std::string dst_desc;
--- 440,444 ----
// assign the dst cardinality constraints to SRC-s
SDList_Iterator it = m_oper1.begin();
! while ( it != m_oper1.end())
{
std::string dst_desc;
Index: FolderRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/FolderRep.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FolderRep.cpp 7 Apr 2005 21:26:24 -0000 1.11
--- FolderRep.cpp 21 Jun 2005 17:16:46 -0000 1.12
***************
*** 105,110 ****
bool fco_list_empty = true;
FCO_ConstIterator it = m_fcoList.begin();
! FCO_ConstIterator en = m_fcoList.end();
! while ( it != en)
{
if (!(*it)->isAbstract())
--- 105,109 ----
bool fco_list_empty = true;
FCO_ConstIterator it = m_fcoList.begin();
! while ( it != m_fcoList.end())
{
if (!(*it)->isAbstract())
***************
*** 133,138 ****
std::vector<FCO *> temp_list;
FCO_Iterator fco_it = m_fcoList.begin();
! FCO_Iterator fco_en = m_fcoList.end();
! for( ; fco_it != fco_en; ++fco_it)
{
FCO * fco_ptr = *fco_it;
--- 132,136 ----
std::vector<FCO *> temp_list;
FCO_Iterator fco_it = m_fcoList.begin();
! for( ; fco_it != m_fcoList.end(); ++fco_it)
{
FCO * fco_ptr = *fco_it;
***************
*** 140,145 ****
fco_ptr->getIntDescendants( descendants);
std::vector<FCO*>::iterator desc_it = descendants.begin();
! std::vector<FCO*>::iterator desc_en = descendants.end();
! for( ; desc_it != desc_en; ++desc_it)
{
FCO * new_member = *desc_it;
--- 138,142 ----
fco_ptr->getIntDescendants( descendants);
std::vector<FCO*>::iterator desc_it = descendants.begin();
! for( ; desc_it != descendants.end(); ++desc_it)
{
FCO * new_member = *desc_it;
***************
*** 165,173 ****
SubFolder_ConstIterator it_f = m_subFolderList.begin();
! SubFolder_ConstIterator en_f = m_subFolderList.end();
! if ( it_f != en_f)
{
mmm += " subfolders = \"" + (*it_f)->getName();
! for( ++it_f; it_f != en_f; ++it_f)
{
mmm += " " + (*it_f)->getName();
--- 162,169 ----
SubFolder_ConstIterator it_f = m_subFolderList.begin();
! if ( it_f != m_subFolderList.end())
{
mmm += " subfolders = \"" + (*it_f)->getName();
! for( ++it_f; it_f != m_subFolderList.end(); ++it_f)
{
mmm += " " + (*it_f)->getName();
***************
*** 183,188 ****
bool first = true;
FCO_Iterator it = m_fcoList.begin();
! FCO_Iterator en = m_fcoList.end();
! while ( it != en)
{
if (!(*it)->isAbstract()) // check for abstract
--- 179,183 ----
bool first = true;
FCO_Iterator it = m_fcoList.begin();
! while ( it != m_fcoList.end())
{
if (!(*it)->isAbstract()) // check for abstract
***************
*** 250,255 ****
ptr->getIntDescendants( descendants);
std::vector<FCO*>::iterator desc_it = descendants.begin();
! std::vector<FCO*>::iterator desc_en = descendants.end();
! for( ; desc_it != desc_en; ++desc_it)
str_expr_begin += " or child.oclIsTypeOf( " + (*desc_it)->getName() + ")";
--- 245,249 ----
ptr->getIntDescendants( descendants);
std::vector<FCO*>::iterator desc_it = descendants.begin();
! for( ; desc_it != descendants.end(); ++desc_it)
str_expr_begin += " or child.oclIsTypeOf( " + (*desc_it)->getName() + ")";
Index: ConnectionRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ConnectionRep.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ConnectionRep.cpp 7 Apr 2005 21:26:24 -0000 1.10
--- ConnectionRep.cpp 21 Jun 2005 17:16:46 -0000 1.11
***************
*** 121,126 ****
std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! std::set< BON::FCO >::const_iterator en = m_equivs.end();
! for ( ; it != en; ++it)
{
if ( *it == m_ptr) continue;
--- 121,125 ----
std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! for ( ; it != m_equivs.end(); ++it)
{
if ( *it == m_ptr) continue;
***************
*** 228,233 ****
std::list<ConnJoint>::iterator it = m_jointList.begin();
! std::list<ConnJoint>::iterator en = m_jointList.end();
! for( ; !desc && it != en; ++it)
desc = desc || it->descendantsOf( a_joint);
--- 227,231 ----
std::list<ConnJoint>::iterator it = m_jointList.begin();
! for( ; !desc && it != m_jointList.end(); ++it)
desc = desc || it->descendantsOf( a_joint);
***************
*** 244,250 ****
// interface inheritance
ModelRepPtrList_Iterator mod_it = models.begin();
- ModelRepPtrList_Iterator mod_en = models.end();
// for all models i am part of
! for( ; mod_it != mod_en; ++mod_it )
{
ModelRep* mod_ptr = *mod_it;
--- 242,247 ----
// interface inheritance
ModelRepPtrList_Iterator mod_it = models.begin();
// for all models i am part of
! for( ; mod_it != models.end(); ++mod_it )
{
ModelRep* mod_ptr = *mod_it;
***************
*** 252,257 ****
// for all connJoints it has
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! for( ; joint_it != joint_en; ++joint_it )
{
joint_it->intInherit( mod_ptr); // creates map containing src and dst roles
--- 249,253 ----
// for all connJoints it has
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! for( ; joint_it != m_jointList.end(); ++joint_it )
{
joint_it->intInherit( mod_ptr); // creates map containing src and dst roles
***************
*** 265,274 ****
std::vector<FCO*>::iterator conn_it = conn_descendants.begin();
! std::vector<FCO*>::iterator conn_en = conn_descendants.end();
! for( ; conn_it != conn_en; ++conn_it)
{
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! for( ; joint_it != joint_en; ++joint_it )
{
ConnectionRep * conn_rep = 0;
--- 261,268 ----
std::vector<FCO*>::iterator conn_it = conn_descendants.begin();
! for( ; conn_it != conn_descendants.end(); ++conn_it)
{
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! for( ; joint_it != m_jointList.end(); ++joint_it )
{
ConnectionRep * conn_rep = 0;
***************
*** 367,372 ****
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! for( ; joint_it != joint_en; ++joint_it )
{
std::string nnn = joint_it->dumpElements( models);
--- 361,365 ----
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! for( ; joint_it != m_jointList.end(); ++joint_it )
{
std::string nnn = joint_it->dumpElements( models);
***************
*** 384,389 ****
bool res = true;
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! for( ; joint_it != joint_en; ++joint_it )
{
res = res && joint_it->checkElements( getName());
--- 377,381 ----
bool res = true;
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! for( ; joint_it != m_jointList.end(); ++joint_it )
{
res = res && joint_it->checkElements( getName());
***************
*** 396,401 ****
{
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! for( ; joint_it != joint_en; ++joint_it )
joint_it->createConstraints(s, getName());
}
--- 388,392 ----
{
std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! for( ; joint_it != m_jointList.end(); ++joint_it )
joint_it->createConstraints(s, getName());
}
- Previous message: [GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004
BON2Component.cpp,1.27,1.28
- Next message: [GME-commit]
GMESRC/GME/MgaUtil GmeDlg.cpp,1.10,1.11 GmeDlg.h,1.9,1.10
MgaRegistrar.cpp,1.41,1.42 MgaRegistrar.h,1.18,1.19
MgaUtil.rc,1.46,1.47 resource.h,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list