[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
AttributeRep.cpp,1.3,1.4 Broker.cpp,1.5,1.6 Dumper.cpp,1.14,1.15
ModelRep.cpp,1.8,1.9 SetRep.cpp,1.3,1.4 Sheet.cpp,1.4,1.5
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Thu Mar 11 09:39:40 CST 2004
Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
In directory braindrain:/tmp/cvs-serv7423/Rep
Modified Files:
AttributeRep.cpp Broker.cpp Dumper.cpp ModelRep.cpp SetRep.cpp
Sheet.cpp
Log Message:
Library subfolders issue resolved.
CVS User: zolmol
Index: AttributeRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/AttributeRep.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AttributeRep.cpp 2 Mar 2004 19:21:12 -0000 1.3
--- AttributeRep.cpp 11 Mar 2004 15:39:38 -0000 1.4
***************
*** 130,134 ****
int i = start_i, comma_i = 0;
- //TO(items);
while( i < len )
{
--- 130,133 ----
***************
*** 160,165 ****
m_items.push_back("Error");
- //TO( std::string("K") + items.substr( start_i, comma_i - start_i) + std::string("V"));
- //TO( std::string("K") + items.substr( comma_i + 1, i - comma_i - 1)+ std::string("V"));
comma_i = 0;
}
--- 159,162 ----
***************
*** 178,183 ****
m_itemsVal.push_back(items.substr( st, end - st + 1));//m_itemsVal.push_back(items.substr( start_i, i - start_i));
}
- //TO( std::string("K") + items.substr( start_i, i - start_i) + std::string("V"));
- //TO( std::string("K") + items.substr( start_i, i - start_i) + std::string("V"));
}
++m_noOfItems;
--- 175,178 ----
Index: Broker.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Broker.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Broker.cpp 10 Mar 2004 02:36:28 -0000 1.5
--- Broker.cpp 11 Mar 2004 15:39:38 -0000 1.6
***************
*** 35,39 ****
/*char d[10];
sprintf(d, "%i", m_metaRefId);
! TO( std::string(d) + " used as max metaref");*/
m_metaRefDB.clear(); // after we know the greatest metaref this can be deleted
--- 35,39 ----
/*char d[10];
sprintf(d, "%i", m_metaRefId);
! global_vars.err << std::string(d) << " used as max metaref\n";*/
m_metaRefDB.clear(); // after we know the greatest metaref this can be deleted
***************
*** 155,160 ****
std::string n1str = "Name" + node.obj->getName() + " path: " + node.path;
std::string n2str = "Name" + otherNode.obj->getName() + " path: " + otherNode.path;
! if (t_1)
! TO( fmtstr + "\n" + n1str + "\n" + n2str);
}
catch(...) {
--- 155,159 ----
std::string n1str = "Name" + node.obj->getName() + " path: " + node.path;
std::string n2str = "Name" + otherNode.obj->getName() + " path: " + otherNode.path;
! //if (t_1) global_vars.err << fmtstr << "\n" << n1str << "\n" << n2str << "\n";
}
catch(...) {
Index: Dumper.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Dumper.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Dumper.cpp 10 Mar 2004 02:36:29 -0000 1.14
--- Dumper.cpp 11 Mar 2004 15:39:38 -0000 1.15
***************
*** 223,227 ****
{
ModelRep * child_mod_ptr = static_cast<ModelRep *>( *child_it);
! if ( !child_mod_ptr) TO("Error after static cast - doInheritance");
// inherit aspects
--- 223,227 ----
{
ModelRep * child_mod_ptr = static_cast<ModelRep *>( *child_it);
! if ( !child_mod_ptr) global_vars.err << "Internal error: after static cast - inheritAspConsAttr\n";
// inherit aspects
***************
*** 388,392 ****
}
catch(...) {
! TO("Exception during registry related write operation.\n");
}
}
--- 388,392 ----
}
catch(...) {
! global_vars.err << "Internal error: Exception during registry related write operation.\n";
}
}
***************
*** 411,415 ****
}
catch(...) {
! TO("Exception during registry related write operation.\n");
}
--- 411,415 ----
}
catch(...) {
! global_vars.err << "Internal error: Exception during registry related write operation.\n";
}
***************
*** 433,437 ****
}
catch(...) {
! TO("Exception during registry related write operation.\n");
}
--- 433,437 ----
}
catch(...) {
! global_vars.err << "Internal error: Exception during registry related write operation.\n";
}
***************
*** 639,647 ****
// the aspect this part is member of is the act_part.getAspectPtr() one !!!
const AspectRep * act_aspect_rep = act_part.getContainerAspectPtr();
! if ( !act_aspect_rep) TO("ZERO pointer"); // there an exception was thrown
std::string act_asp_name = act_aspect_rep->getName();
const ModelRep * act_mod_ptr = act_part.getParentPtr();
! if( !act_mod_ptr) TO("ZERO pointer");
std::string act_mod_name = act_mod_ptr->getName();
--- 639,649 ----
// the aspect this part is member of is the act_part.getAspectPtr() one !!!
const AspectRep * act_aspect_rep = act_part.getContainerAspectPtr();
! if ( !act_aspect_rep) global_vars.err << "Internal error: ZERO pointer after aspect mapping in act_part.getContainerAspectPtr.\n"; // there an exception was thrown
! ASSERT( act_aspect_rep);
std::string act_asp_name = act_aspect_rep->getName();
const ModelRep * act_mod_ptr = act_part.getParentPtr();
! if( !act_mod_ptr) global_vars.err << "Internal error: ZERO pointer after aspect mapping in act_part.getParentPtr\n";
! ASSERT( act_mod_ptr);
std::string act_mod_name = act_mod_ptr->getName();
***************
*** 669,673 ****
act_part.getFCOPtr()->getMyRegistry()->setValueByPath( regPath, regVal);
} catch( ...) {
! TO("Exception during registry related write operation.\n");
}
}
--- 671,675 ----
act_part.getFCOPtr()->getMyRegistry()->setValueByPath( regPath, regVal);
} catch( ...) {
! global_vars.err << "Internal error: Exception during registry related write operation.\n";
}
}
***************
*** 699,703 ****
act_part.getFCOPtr()->getMyRegistry()->setValueByPath( regPath, regVal);
} catch(...) {
! TO("Exception during registry related write operation.\n");
}
}
--- 701,705 ----
act_part.getFCOPtr()->getMyRegistry()->setValueByPath( regPath, regVal);
} catch(...) {
! global_vars.err << "Internal error: Exception during registry related write operation.\n";
}
}
***************
*** 1441,1445 ****
if (multip < 0) {
//AfxMessageBox("Multiplicity is negative: " + contextDesc, MB_ICONEXCLAMATION);
! TO( std::string("Multiplicity is negative: ") + contextDesc);
}
//orexpr.Format("(%s = %d)", target, multip);
--- 1443,1447 ----
if (multip < 0) {
//AfxMessageBox("Multiplicity is negative: " + contextDesc, MB_ICONEXCLAMATION);
! global_vars.err << "Error: Multiplicity is negative: " << contextDesc << "\n";
}
//orexpr.Format("(%s = %d)", target, multip);
***************
*** 1465,1469 ****
if (multipmin < 0) {
//AfxMessageBox("Minimum multiplicity is negative: " + contextDesc, MB_ICONEXCLAMATION);
! TO( std::string("Minimum multiplicity is negative: ") + contextDesc);
}
if (multipmin > 0) {
--- 1467,1471 ----
if (multipmin < 0) {
//AfxMessageBox("Minimum multiplicity is negative: " + contextDesc, MB_ICONEXCLAMATION);
! global_vars.err << "Error: Minimum multiplicity is negative: " << contextDesc << "\n";
}
if (multipmin > 0) {
***************
*** 1493,1501 ****
if (multipmax < 0) {
//AfxMessageBox("Maximum multiplicity is negative: " + contextDesc, MB_ICONEXCLAMATION);
! TO( std::string("Maximum multiplicity is negative: ") + contextDesc);
}
if (multipmax < multipmin) {
//AfxMessageBox("Minimum multiplicity > Maximum multiplicity : " + contextDesc, MB_ICONEXCLAMATION);
! TO( std::string("Minimum multiplicity > Maximum multiplicity : ") + contextDesc);
}
}
--- 1495,1503 ----
if (multipmax < 0) {
//AfxMessageBox("Maximum multiplicity is negative: " + contextDesc, MB_ICONEXCLAMATION);
! global_vars.err << "Error: Maximum multiplicity is negative: " << contextDesc << "\n";
}
if (multipmax < multipmin) {
//AfxMessageBox("Minimum multiplicity > Maximum multiplicity : " + contextDesc, MB_ICONEXCLAMATION);
! global_vars.err << "Error: Minimum multiplicity > Maximum multiplicity : " << contextDesc << "\n";
}
}
Index: ModelRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ModelRep.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ModelRep.cpp 10 Mar 2004 02:36:29 -0000 1.8
--- ModelRep.cpp 11 Mar 2004 15:39:38 -0000 1.9
***************
*** 244,250 ****
{
if ( (*model_it)->getMyKind() != Any::MODEL)
! TO("ERROR");
ModelRep * mod_desc_ptr = static_cast<ModelRep*>(*model_it);
! if (!mod_desc_ptr) TO(" NULL PTR ERROR");
m_name = mod_desc_ptr->getName();
--- 244,250 ----
{
if ( (*model_it)->getMyKind() != Any::MODEL)
! global_vars.err << "Error: nonmodel kind as model descendant\n";
ModelRep * mod_desc_ptr = static_cast<ModelRep*>(*model_it);
! if (!mod_desc_ptr) global_vars.err << "Error: model descendant badly casted to model\n";
m_name = mod_desc_ptr->getName();
***************
*** 274,278 ****
// the descendants must have a separate role for each initial role
// this role is inherited and has long form depending on the hierarchy_flag
- //TO( role_it->getOnlyRoleName());
RoleRep r(
role_it->getOnlyRoleName(),
--- 274,277 ----
***************
*** 286,290 ****
mod_desc_ptr->addFinalRole( *desc_it, r);
(*desc_it)->iAmPartOfFinal( mod_desc_ptr);//(*desc_it)->iAmPartOf( this);
- //TO( bon_ptr->GetName() + " < " + r.getRoleName().c_str() + " > " + bon_m_ptr->GetName());
}
}
--- 285,288 ----
Index: SetRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/SetRep.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SetRep.cpp 2 Mar 2004 19:21:12 -0000 1.3
--- SetRep.cpp 11 Mar 2004 15:39:38 -0000 1.4
***************
*** 116,120 ****
// add the roles to the member list of the set ( in that model)
one_set->addSetMemberRole( mod_ptr, series);
- //TO("Previous element names have been added to " + this->getName() + "[" + mod_ptr->getName() + "]");
}
}
--- 116,119 ----
***************
*** 215,219 ****
if ( !member_ptr->checkIsPartOfFinal() && !member_ptr->isAbstract())
{
! TO("CHECK: set member " + member_ptr->getName() + " in set \"" + getName() + "\" is not contained by any model.\n");
res = false;
}
--- 214,218 ----
if ( !member_ptr->checkIsPartOfFinal() && !member_ptr->isAbstract())
{
! global_vars.err << "CHECK: set member " << member_ptr->getName() << " in set \"" << getName() << "\" is not contained by any model.\n";
res = false;
}
Index: Sheet.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Sheet.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Sheet.cpp 10 Mar 2004 02:36:29 -0000 1.4
--- Sheet.cpp 11 Mar 2004 15:39:38 -0000 1.5
***************
*** 583,588 ****
if (elements.size() < no_of_cliques) // because from each clique there must be at least 1 root
{
! TO("Circle found in model");
! global_vars.err << "Circle found in model\n";
//std::cout << "Circle\n";
// based on that if in a clique there is no node with outgoing degree of 0
--- 583,588 ----
if (elements.size() < no_of_cliques) // because from each clique there must be at least 1 root
{
! TO("Inheritance loop found in model!!! Please correct it!\n");
! global_vars.err << "Inheritance loop found in model!!! Please correct it!\n";
//std::cout << "Circle\n";
// based on that if in a clique there is no node with outgoing degree of 0
***************
*** 630,634 ****
// using the ancestors database build up the m_desc and m_anc fields of each fco
- //for( i = 0; i < elements.size(); ++i)
std::map< unsigned int, std::vector<unsigned int> >::iterator anc_it = ancestors.begin();
for( ; anc_it != ancestors.end(); ++anc_it)
--- 630,633 ----
***************
*** 637,641 ****
std::vector<unsigned int> & ancestors_of_id = anc_it->second;
- //for ( unsigned int k = 0; k < ancestors[i].size(); ++k)
for( unsigned int k = 0; k < ancestors_of_id.size(); ++k)
{
--- 636,639 ----
***************
*** 644,651 ****
//TO( m1);
- /*unsigned int l = 0;
- while( l < descendants[ancestors_of_id[k]].size() && descendants[ancestors_of_id[k]][l] != id)
- ++l;
- if ( l == descendants[ancestors_of_id[k]].size())*/
if ( std::find( descendants[ancestors_of_id[k]].begin(), descendants[ancestors_of_id[k]].end(), id) ==
descendants[ancestors_of_id[k]].end()) // not found then insert
--- 642,645 ----
***************
*** 658,670 ****
}
- //for( i = 0; i < elements.size(); ++i)
for( i = 0; i < node_vec.size(); ++i)
{
! std::string mmma, mmmd, mmm;
std::vector< FCO*> anc_list, desc_list;
for ( unsigned int k = 0; k < ancestors[i].size(); ++k)
{
anc_list.push_back( node_vec[ancestors[i][k]]);
! mmma += node_vec[ancestors[i][k]]->getName() + " ";
}
--- 652,663 ----
}
for( i = 0; i < node_vec.size(); ++i)
{
! //std::string mmma, mmmd, mmm;
std::vector< FCO*> anc_list, desc_list;
for ( unsigned int k = 0; k < ancestors[i].size(); ++k)
{
anc_list.push_back( node_vec[ancestors[i][k]]);
! //mmma += node_vec[ancestors[i][k]]->getName() + " ";
}
***************
*** 672,678 ****
{
desc_list.push_back( node_vec[descendants[i][l]]);
! mmmd += node_vec[descendants[i][l]]->getName() + " ";
}
! mmm = node_vec[i]->getName() + std::string( (inh_type==FCO::INTERFACE)?" INTERFACE":(inh_type==FCO::IMPLEMENTATION)?" IMPLEMENTATION":" OTHER");
//TO ( mmm + "\nanc:\n" + mmma + "\ndesc:\n" + mmmd);
node_vec[i]->setAncestors( inh_type, anc_list);
--- 665,671 ----
{
desc_list.push_back( node_vec[descendants[i][l]]);
! //mmmd += node_vec[descendants[i][l]]->getName() + " ";
}
! //mmm = node_vec[i]->getName() + std::string( (inh_type==FCO::INTERFACE)?" INTERFACE":(inh_type==FCO::IMPLEMENTATION)?" IMPLEMENTATION":" OTHER");
//TO ( mmm + "\nanc:\n" + mmma + "\ndesc:\n" + mmmd);
node_vec[i]->setAncestors( inh_type, anc_list);
More information about the GME-commit
mailing list