[GME-commit]
GMESRC/Paradigms/MetaGME/Paradigm MetaGME-model.xme,1.6,1.7
MetaGME.xmp,1.29,1.30
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Mon Apr 12 16:54:35 CDT 2004
- Previous message: [GME-commit]
GMESRC/Tools/GMETableEditor TableEditorDumper.h,NONE,1.1
TableEditorDumper.cpp,NONE,1.1 GridDlg.cpp,1.9,1.10
- Next message: [GME-commit]
GMESRC/SDK/BON Builder.cpp,1.25,1.26 Builder.h,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/Paradigm
In directory braindrain:/tmp/cvs-serv18518
Modified Files:
MetaGME-model.xme MetaGME.xmp
Log Message:
1.Constraint bugs corrected: changed 1st parameter of self.attachingConnections( )
2.Eliminated "isOperandsValid" constraint function overloading
Modified Files:
MetaGME-model.xme MetaGME.xmp
CVS User: zolmol
Index: MetaGME-model.xme
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/Paradigm/MetaGME-model.xme,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MetaGME-model.xme 11 Mar 2004 17:12:09 -0000 1.6
--- MetaGME-model.xme 12 Apr 2004 20:54:32 -0000 1.7
***************
*** 2,6 ****
<!DOCTYPE project SYSTEM "mga.dtd">
! <project guid="{00000000-0000-0000-0000-000000000000}" cdate="Thu Mar 11 10:59:44 2004" mdate="Thu Mar 11 10:59:47 2004" metaguid="{68B472BC-DEAD-BEEF-FEED-DAD000000001}" metaname="MetaGME">
<name>MetaGME</name>
<comment></comment>
--- 2,6 ----
<!DOCTYPE project SYSTEM "mga.dtd">
! <project guid="{00000000-0000-0000-0000-000000000000}" cdate="Wed Mar 17 11:18:05 2004" mdate="Mon Apr 12 15:48:02 2004" metaguid="{99CB7435-DEAD-BEEF-FEED-DAD000000001}" metaname="MetaGME">
<name>MetaGME</name>
[...1846 lines suppressed...]
<connpoint role="dst" target="id-0066-0000014c"/>
! <connpoint role="src" target="id-0067-00000026"/>
</connection>
<connection id="id-0068-00000189" kind="SameAspectRight" role="SameAspectRight" relid="0xa">
<name>SameAspectRight</name>
<connpoint role="dst" target="id-0066-00000149"/>
! <connpoint role="src" target="id-0067-00000024"/>
</connection>
<connection id="id-0068-0000018a" kind="HasAttribute" role="HasAttribute" relid="0x10">
--- 28698,28707 ----
<name>SameAspectRight</name>
<connpoint role="dst" target="id-0066-0000014c"/>
! <connpoint role="src" target="id-0067-00000008"/>
</connection>
<connection id="id-0068-00000189" kind="SameAspectRight" role="SameAspectRight" relid="0xa">
<name>SameAspectRight</name>
<connpoint role="dst" target="id-0066-00000149"/>
! <connpoint role="src" target="id-0067-00000006"/>
</connection>
<connection id="id-0068-0000018a" kind="HasAttribute" role="HasAttribute" relid="0x10">
Index: MetaGME.xmp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/Paradigm/MetaGME.xmp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** MetaGME.xmp 11 Mar 2004 17:12:10 -0000 1.29
--- MetaGME.xmp 12 Apr 2004 20:54:33 -0000 1.30
***************
*** 347,351 ****
]]>
</constraint>
! <constraint type="function" name="isOperandsValid">
<![CDATA[method;SameAspect;;Sequence;
let left = self.connectedFCOs( "dst", SameAspectLeft ) in
--- 347,351 ----
]]>
</constraint>
! <constraint type="function" name="isOperandsValidA">
<![CDATA[method;SameAspect;;Sequence;
let left = self.connectedFCOs( "dst", SameAspectLeft ) in
***************
*** 362,369 ****
endif]]>
</constraint>
! <constraint type="function" name="isOperandsValid">
! <![CDATA[method;SameFolder;;Sequence;
! let left = self.connectedFCOs( "dst", SameFolderLeft ) in
! let right = self.connectedFCOs( "src", SameFolderRight ) in
if ( left->size <> 1 or right->size <> 1 ) then
Sequence{ 0 }
--- 362,369 ----
endif]]>
</constraint>
! <constraint type="function" name="isOperandsValidE">
! <![CDATA[method;Equivalence;;Sequence;
! let left = self.connectedFCOs( "dst", EquivLeft ) in
! let right = self.connectedFCOs( "src", EquivRight ) in
if ( left->size <> 1 or right->size <> 1 ) then
Sequence{ 0 }
***************
*** 377,384 ****
endif]]>
</constraint>
! <constraint type="function" name="isOperandsValid">
! <![CDATA[method;Equivalence;;Sequence;
! let left = self.connectedFCOs( "dst", EquivLeft ) in
! let right = self.connectedFCOs( "src", EquivRight ) in
if ( left->size <> 1 or right->size <> 1 ) then
Sequence{ 0 }
--- 377,384 ----
endif]]>
</constraint>
! <constraint type="function" name="isOperandsValidF">
! <![CDATA[method;SameFolder;;Sequence;
! let left = self.connectedFCOs( "dst", SameFolderLeft ) in
! let right = self.connectedFCOs( "src", SameFolderRight ) in
if ( left->size <> 1 or right->size <> 1 ) then
Sequence{ 0 }
***************
*** 891,896 ****
</constraint>
<constraint name="HasDestination" eventmask = "0x0" depth = "0" priority = "2">
! <![CDATA[self.connectedFCOs( "dst", ConnectorToDestination ) -> size <> 0
! ]]>
<dispname>Connector is superfluous or invalid. It does not have Destination.</dispname>
</constraint>
--- 891,895 ----
</constraint>
<constraint name="HasDestination" eventmask = "0x0" depth = "0" priority = "2">
! <![CDATA[self.connectedFCOs( "dst", ConnectorToDestination ) -> size <> 0]]>
<dispname>Connector is superfluous or invalid. It does not have Destination.</dispname>
</constraint>
***************
*** 901,915 ****
<constraint name="OnlyOneAssocClass" eventmask = "0x800" depth = "0" priority = "1">
<![CDATA[let assocCount = self.attachingConnections( AssociationClass ) -> size in
! assocCount <> 0 implies assocCount = 1
! ]]>
<dispname>Connector must have exactly one Connection as Association Class</dispname>
</constraint>
<constraint name="OnlyOneDestination" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let dstCount = self.attachingConnections( "dst", ConnectorToDestination ) -> size in
dstCount <> 0 implies dstCount = 1]]>
<dispname>Connector must have exactly one Destination</dispname>
</constraint>
<constraint name="OnlyOneSource" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let srcCount = self.attachingConnections( "src", SourceToConnector ) -> size in
srcCount <> 0 implies srcCount = 1]]>
<dispname>Connector must have exactly one Source</dispname>
--- 900,913 ----
<constraint name="OnlyOneAssocClass" eventmask = "0x800" depth = "0" priority = "1">
<![CDATA[let assocCount = self.attachingConnections( AssociationClass ) -> size in
! assocCount <> 0 implies assocCount = 1]]>
<dispname>Connector must have exactly one Connection as Association Class</dispname>
</constraint>
<constraint name="OnlyOneDestination" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let dstCount = self.attachingConnections( "src", ConnectorToDestination ) -> size in
dstCount <> 0 implies dstCount = 1]]>
<dispname>Connector must have exactly one Destination</dispname>
</constraint>
<constraint name="OnlyOneSource" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let srcCount = self.attachingConnections( "dst", SourceToConnector ) -> size in
srcCount <> 0 implies srcCount = 1]]>
<dispname>Connector must have exactly one Source</dispname>
***************
*** 1061,1065 ****
<regnode name = "autorouterPref" value ="Ew"></regnode>
<constraint name="DifferentOperands" eventmask = "0x0" depth = "0" priority = "2">
! <![CDATA[let ops = self.isOperandsValid() in
if ( ops->size <> 2 ) then
true
--- 1059,1063 ----
<regnode name = "autorouterPref" value ="Ew"></regnode>
<constraint name="DifferentOperands" eventmask = "0x0" depth = "0" priority = "2">
! <![CDATA[let ops = self.isOperandsValidE() in
if ( ops->size <> 2 ) then
true
***************
*** 1096,1105 ****
</constraint>
<constraint name="OnlyOneLeft" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let leftCount = self.attachingConnections( "dst", EquivLeft ) -> size in
leftCount <> 0 implies leftCount = 1]]>
<dispname>Equivalence operator is invalid. It has to have exaclty one FCO on the left-side.</dispname>
</constraint>
<constraint name="OnlyOneRight" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let rightCount = self.attachingConnections( "src", EquivRight ) -> size in
rightCount <> 0 implies rightCount = 1]]>
<dispname>Equivalence operator is invalid. It has to have exaclty one FCO on the right-side.</dispname>
--- 1094,1103 ----
</constraint>
<constraint name="OnlyOneLeft" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let leftCount = self.attachingConnections( "src", EquivLeft ) -> size in
leftCount <> 0 implies leftCount = 1]]>
<dispname>Equivalence operator is invalid. It has to have exaclty one FCO on the left-side.</dispname>
</constraint>
<constraint name="OnlyOneRight" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let rightCount = self.attachingConnections( "dst", EquivRight ) -> size in
rightCount <> 0 implies rightCount = 1]]>
<dispname>Equivalence operator is invalid. It has to have exaclty one FCO on the right-side.</dispname>
***************
*** 1111,1115 ****
</constraint>
<constraint name="ValidOperands" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[self.isOperandsValid().notEmpty()]]>
<dispname>Operands of Equivalence can be neither the same class nor classes with different types</dispname>
</constraint>
--- 1109,1113 ----
</constraint>
<constraint name="ValidOperands" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[self.isOperandsValidE().notEmpty()]]>
<dispname>Operands of Equivalence can be neither the same class nor classes with different types</dispname>
</constraint>
***************
*** 1296,1300 ****
</constraint>
<constraint name="OnlyOneBase" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let baseCount = self.attachingConnections( "src", BaseImpInheritance ) -> size in
baseCount <> 0 implies baseCount = 1]]>
<dispname>Implementation inheritance operator has exactly one base class</dispname>
--- 1294,1298 ----
</constraint>
<constraint name="OnlyOneBase" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let baseCount = self.attachingConnections( "dst", BaseImpInheritance ) -> size in
baseCount <> 0 implies baseCount = 1]]>
<dispname>Implementation inheritance operator has exactly one base class</dispname>
***************
*** 1316,1320 ****
</constraint>
<constraint name="OnlyOneBase" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let baseCount = self.attachingConnections( "src", BaseInheritance ) -> size in
baseCount <> 0 implies baseCount = 1]]>
<dispname>Inheritance operator has exactly one base class</dispname>
--- 1314,1318 ----
</constraint>
<constraint name="OnlyOneBase" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let baseCount = self.attachingConnections( "dst", BaseInheritance ) -> size in
baseCount <> 0 implies baseCount = 1]]>
<dispname>Inheritance operator has exactly one base class</dispname>
***************
*** 1338,1342 ****
</constraint>
<constraint name="OnlyOneBase" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let baseCount = self.attachingConnections( "src", BaseIntInheritance ) -> size in
baseCount <> 0 implies baseCount = 1]]>
<dispname>Interface inheritance operator have exactly one base class</dispname>
--- 1336,1340 ----
</constraint>
<constraint name="OnlyOneBase" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let baseCount = self.attachingConnections( "dst", BaseIntInheritance ) -> size in
baseCount <> 0 implies baseCount = 1]]>
<dispname>Interface inheritance operator have exactly one base class</dispname>
***************
*** 1507,1511 ****
<regnode name = "autorouterPref" value ="Ew"></regnode>
<constraint name="DifferentOperands" eventmask = "0x0" depth = "0" priority = "2">
! <![CDATA[let ops = self.isOperandsValid() in
if ( ops->size <> 2 ) then
true
--- 1505,1509 ----
<regnode name = "autorouterPref" value ="Ew"></regnode>
<constraint name="DifferentOperands" eventmask = "0x0" depth = "0" priority = "2">
! <![CDATA[let ops = self.isOperandsValidA() in
if ( ops->size <> 2 ) then
true
***************
*** 1533,1542 ****
</constraint>
<constraint name="OnlyOneLeft" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let leftCount = self.attachingConnections( "dst", SameAspectLeft ) -> size in
leftCount <> 0 implies leftCount = 1]]>
<dispname>SameAspect operator is invalid. It has to have exaclty one Aspect on the left-side.</dispname>
</constraint>
<constraint name="OnlyOneRight" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let rightCount = self.attachingConnections( "src", SameAspectRight ) -> size in
rightCount <> 0 implies rightCount = 1]]>
<dispname>SameAspect operator is invalid. It has to have exaclty one Aspect on the right-side.</dispname>
--- 1531,1540 ----
</constraint>
<constraint name="OnlyOneLeft" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let leftCount = self.attachingConnections( "src", SameAspectLeft ) -> size in
leftCount <> 0 implies leftCount = 1]]>
<dispname>SameAspect operator is invalid. It has to have exaclty one Aspect on the left-side.</dispname>
</constraint>
<constraint name="OnlyOneRight" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let rightCount = self.attachingConnections( "dst", SameAspectRight ) -> size in
rightCount <> 0 implies rightCount = 1]]>
<dispname>SameAspect operator is invalid. It has to have exaclty one Aspect on the right-side.</dispname>
***************
*** 1548,1552 ****
</constraint>
<constraint name="ValidOperands" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[self.isOperandsValid().notEmpty()]]>
<dispname>Operands of SameAspect cannot be the same aspect.</dispname>
</constraint>
--- 1546,1550 ----
</constraint>
<constraint name="ValidOperands" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[self.isOperandsValidA().notEmpty()]]>
<dispname>Operands of SameAspect cannot be the same aspect.</dispname>
</constraint>
***************
*** 1558,1562 ****
<regnode name = "autorouterPref" value ="Ew"></regnode>
<constraint name="DifferentOperands" eventmask = "0x0" depth = "0" priority = "2">
! <![CDATA[let ops = self.isOperandsValid() in
if ( ops.isEmpty() ) then
true
--- 1556,1560 ----
<regnode name = "autorouterPref" value ="Ew"></regnode>
<constraint name="DifferentOperands" eventmask = "0x0" depth = "0" priority = "2">
! <![CDATA[let ops = self.isOperandsValidF() in
if ( ops.isEmpty() ) then
true
***************
*** 1584,1595 ****
</constraint>
<constraint name="OnlyOneLeft" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let leftCount = self.attachingConnections( "dst", SameFolderLeft ) -> size in
leftCount <> 0 implies leftCount = 1]]>
<dispname>SameFolder operator is invalid. It has to have exaclty one FCO on the left-side.</dispname>
</constraint>
<constraint name="OnlyOneRight" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let rightCount = self.attachingConnections( "src", SameFolderRight ) -> size in
! rightCount <> 0 implies rightCount = 1
! ]]>
<dispname>SameFolder operator is invalid. It has to have exaclty one FCO on the right-side.</dispname>
</constraint>
--- 1582,1592 ----
</constraint>
<constraint name="OnlyOneLeft" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let leftCount = self.attachingConnections( "src", SameFolderLeft ) -> size in
leftCount <> 0 implies leftCount = 1]]>
<dispname>SameFolder operator is invalid. It has to have exaclty one FCO on the left-side.</dispname>
</constraint>
<constraint name="OnlyOneRight" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[let rightCount = self.attachingConnections( "dst", SameFolderRight ) -> size in
! rightCount <> 0 implies rightCount = 1]]>
<dispname>SameFolder operator is invalid. It has to have exaclty one FCO on the right-side.</dispname>
</constraint>
***************
*** 1600,1604 ****
</constraint>
<constraint name="ValidOperands" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[self.isOperandsValid().notEmpty()]]>
<dispname>Operands of SameFolder cannot be the same folder.</dispname>
</constraint>
--- 1597,1601 ----
</constraint>
<constraint name="ValidOperands" eventmask = "0x800" depth = "0" priority = "1">
! <![CDATA[self.isOperandsValidF().notEmpty()]]>
<dispname>Operands of SameFolder cannot be the same folder.</dispname>
</constraint>
- Previous message: [GME-commit]
GMESRC/Tools/GMETableEditor TableEditorDumper.h,NONE,1.1
TableEditorDumper.cpp,NONE,1.1 GridDlg.cpp,1.9,1.10
- Next message: [GME-commit]
GMESRC/SDK/BON Builder.cpp,1.25,1.26 Builder.h,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list