diff --git a/anno3/vpc/consegne/3/3.6.PNPRO b/anno3/vpc/consegne/3/3.6.PNPRO index 507a037..718c316 100644 --- a/anno3/vpc/consegne/3/3.6.PNPRO +++ b/anno3/vpc/consegne/3/3.6.PNPRO @@ -134,6 +134,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rO0ABXNyABRqYXZhLnV0aWwuTGlua2VkTGlzdAwpU11KYIgiAwAAeHB3BAAAAMF0AJMbWzBtRVhFQzogL3Vzci9sb2NhbC9HcmVhdFNQTi9iaW4vRFNQTi1Ub29sIC1sb2FkICIvaG9tZS91c2VyL1VOSVRPL2Fubm8zL3ZwYy9jb25zZWduZS8zLzMuNi1NZWFzdXJlcy5zb2x1dGlvbi9QVCIgLXBiYXNpcyAtZGV0ZWN0LWV4cCAtcHNmbCAtYm5kIAp0AHAbWzFtG1s0bUxPQURJTkcgUEVUUkkgTkVUIC9ob21lL3VzZXIvVU5JVE8vYW5ubzMvdnBjL2NvbnNlZ25lLzMvMy42LU1lYXN1cmVzLnNvbHV0aW9uL1BUIChuZXQvZGVmKS4uLhtbMjJtG1syNG0KdAAPTUFSS0lORyBQQVI6IDAKdAAQUExBQ0VTOiAgICAgIDE0CnQAD1JBVEUgUEFSOiAgICAwCnQAEFRSQU5TSVRJT05TOiAxMgp0AA9NRUFTVVJFUzogICAgMAp0AChMT0FESU5HIFRJTUU6IFtVc2VyIDAuMDAwcywgU3lzIDAuMDAwc10KdAABCnQAAQp0AB5DT01QVVRJTkcgUExBQ0UgRkxPVyBCQVNJUy4uLgp0ABJNPTEyLCBOPTE0LCBOMD0xNAp0ADlDb21wdXRhdGlvbiBvZiBGbG93IGJhc2lzOiBzdGVwIDEvMTIsIHxLfD0xMiwgcHJvZHVjdHM9MQp0AFMbWzFBICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCnQAUhtbMUFDb21wdXRhdGlvbiBvZiBGbG93IGJhc2lzOiBjb21wbGV0ZWQgaW4gOCBzdGVwcywgfEt8PTYuICAgICAgICAgICAgICAgICAgICAgIAp0AEBGT1VORCA2IFZFQ1RPUlMgSU4gVEhFIFBMQUNFIEZMT1cgQkFTSVMgKDQgc2VtaWZsb3dzLCAyIGZsb3dzKS4KdAABCnQAAQp0ACdBbGwgcGxhY2VzIGFyZSBjb3ZlcmVkIGJ5IHNvbWUgUC1mbG93Lgp0AAEKdAAmVE9UQUwgVElNRTogW1VzZXIgMC4wMDBzLCBTeXMgMC4wMDBzXQp0ACdBVk9JRCBFWFBPTkVOVElBTCBHUk9XVEggT0YgU0VNSUZMT1dTLgp0AB1DT01QVVRJTkcgUExBQ0UgU0VNSUZMT1dTLi4uCnQAEk09MTIsIE49MTQsIE4wPTE0CnQAK0dlbmVyYXRpb24gb2YgU2VtaWZsb3dzOiBzdGVwIDEvMTIsIHxLfD0xMgp0AFMbWzFBICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCnQAUBtbMUFHZW5lcmF0aW9uIG9mIFNlbWlmbG93czogY29tcGxldGVkIGluIDggc3RlcHMsIHxLfD04LiAgICAgICAgICAgICAgICAgICAgICAKdAAZRk9VTkQgOCBQTEFDRSBTRU1JRkxPV1MuCnQAAQp0AAEKdAArQWxsIHBsYWNlcyBhcmUgY292ZXJlZCBieSBzb21lIFAtc2VtaWZsb3cuCnQAAQp0ACZUT1RBTCBUSU1FOiBbVXNlciAwLjAwMHMsIFN5cyAwLjAwMHNdCnQALENPTVBVVElORyBQTEFDRSBCT1VORFMgRlJPTSBQLVNFTUlGTE9XUyAuLi4KdAAnG1swWBtbMzJtIFBST0NFU1MgRVhJVEVEIE5PUk1BTExZLhtbMG0KdACkG1swbUVYRUM6IHBlcmwgLWUgJ2FsYXJtIDUgOyBleGVjICIvdXNyL2xvY2FsL0dyZWF0U1BOL2Jpbi9EU1BOLVRvb2wgLWxvYWQgXCIvaG9tZS91c2VyL1VOSVRPL2Fubm8zL3ZwYy9jb25zZWduZS8zLzMuNi1NZWFzdXJlcy5zb2x1dGlvbi9QVFwiIC1sb2FkLWJuZCAtaWxwLWJuZCIgJwp0AHAbWzFtG1s0bUxPQURJTkcgUEVUUkkgTkVUIC9ob21lL3VzZXIvVU5JVE8vYW5ubzMvdnBjL2NvbnNlZ25lLzMvMy42LU1lYXN1cmVzLnNvbHV0aW9uL1BUIChuZXQvZGVmKS4uLhtbMjJtG1syNG0KdAAPTUFSS0lORyBQQVI6IDAKdAAQUExBQ0VTOiAgICAgIDE0CnQAD1JBVEUgUEFSOiAgICAwCnQAEFRSQU5TSVRJT05TOiAxMgp0AA9NRUFTVVJFUzogICAgMAp0AChMT0FESU5HIFRJTUU6IFtVc2VyIDAuMDAwcywgU3lzIDAuMDAwc10KdAABCnQAAQp0ABVMT0FESU5HIEJORCBGSUxFIC4uLgp0ACVDT01QVVRJTkcgUExBQ0UgQk9VTkRTIFVTSU5HIElMUCAuLi4KdAAYQWxsIHBsYWNlcyBhcmUgYm91bmRlZC4KcQB+ACR0AHgbWzBtRVhFQzogL3Vzci9sb2NhbC9HcmVhdFNQTi9iaW4vUkdNRUREMyAiL2hvbWUvdXNlci9VTklUTy9hbm5vMy92cGMvY29uc2VnbmUvMy8zLjYtTWVhc3VyZXMuc29sdXRpb24vUFQiIC1NRVRBICAtYyAtQwp0AB9SYW5kb20gc2VlZHM6IDE1ODk2MzQ3MTMgNDg5MjQKdABQPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQp0ABFHcmVhdFNQTi9NZWRkbHkuCnQAOCAgQ29weXJpZ2h0IChDKSAxOTg3LTIwMTgsIFVuaXZlcnNpdHkgb2YgVG9yaW5vLCBJdGFseS4KdAAxICBTZW5kIGZpbGVzIG5ldG5hbWUubmV0LCAuZGVmIHRvIGUtbWFpbCBhZGRyZXNzCnQAKyAgYmVjY3V0aUBkaS51bml0by5pdCBpZiB5b3UgZmluZCBhbnkgYnVnLgp0AFA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CnQAH0Jhc2VkIG9uIE1FRERMWSB2ZXJzaW9uIDAuMTYuMAp0AEYgIENvcHlyaWdodCAoQykgMjAwOSwgSW93YSBTdGF0ZSBVbml2ZXJzaXR5IFJlc2VhcmNoIEZvdW5kYXRpb24sIEluYy4KdAApICB3ZWJzaXRlOiBodHRwOi8vbWVkZGx5LnNvdXJjZWZvcmdlLm5ldAp0AFA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CnQAKVVzaW5nIHBlci1ldmVudCBzYXR1cmF0aW9uIChzYXQtcHJlZ2VuKS4KdAAbVXNpbmcgZmFzdCBOU0YgZ2VuZXJhdGlvbi4KdAASUHJvY2VzcyBJRDogMjgzNDEKdABLTU9ERUwgTkFNRTogL2hvbWUvdXNlci9VTklUTy9hbm5vMy92cGMvY29uc2VnbmUvMy8zLjYtTWVhc3VyZXMuc29sdXRpb24vUFQKdAAdICAxNCBwbGFjZXMsIDEyIHRyYW5zaXRpb25zLgp0ACdVc2VkIE1lbW9yeSBmb3IgZW5jb2RpbmcgbmV0OiAzNzA2OTZLQgp0AFVPcGVuaW5nIGZpbGU6IC9ob21lL3VzZXIvVU5JVE8vYW5ubzMvdnBjL2NvbnNlZ25lLzMvMy42LU1lYXN1cmVzLnNvbHV0aW9uL1BULmJuZCBPSy4KdABYT3BlbmluZyBmaWxlOiAvaG9tZS91c2VyL1VOSVRPL2Fubm8zL3ZwYy9jb25zZWduZS8zLzMuNi1NZWFzdXJlcy5zb2x1dGlvbi9QVC5pbHBibmQgT0suCnQAEElOUFVUIEFSQ1M6ICAxNAp0ABBPVVRQVVQgQVJDUzogMTQKdAAPSU5ISUIgQVJDUzogIDAKdAAPVEVTVCBBUkNTOiAgIDQKdAAQUExBQ0VTOiAgICAgIDE0CnQAEFRSQU5TSVRJT05TOiAxMgp0AA9JTlZBUklBTlRTOiAgNgp0AA9QLVNFTUlGTE9XUzogOAp0ABZNQVggSU5WQVJJQU5UIENBUkQ6IDEKdAABCnQAUD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0gVkFSSUFCTEUgT1JERVIgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KdAA8VmFyaWFibGUgb3JkZXIgbWV0aG9kOiBNZXRhLWhldXJpc3RpYyB1c2luZyB3ZWlnaHRlZCBzY29yZS4KdABRICBNRVRIT0QgICAgICAgICAgICAgIFNDT1JFICAgICAgICBTV0lSICAgICAgIFNPVVBTIERJU0NPVU5UICBXRUlHSFQgICAgICAgVElNRSAKdABVICBTTE8gICAgICAgICAgICAgICAgMTA2LjU5ICAgICAgICAgIDk1ICAgICAgICAgIDUxICAgICAgICAxICAgMS4xMjIgICAwLjAwMDEyMSBzZWMuCnQAVSAgU0xPK0ZvcmNlICAgICAgICAgICA1Ni4zMiAgICAgICAgICA2NCAgICAgICAgICA0NSAgICAgICAgMSAgICAwLjg4ICAgIDUuMWUtMDUgc2VjLgp0AFUgIFNMTy0xNiAgICAgICAgICAgICAgNzUuODEgICAgICAgICAgOTUgICAgICAgICAgNTEgICAgICAgIDEgICAwLjc5OCAgICA1LjVlLTA1IHNlYy4KdABVICBTTE8tMTYrRm9yY2UgICAgICAgNTguMzA0ICAgICAgICAgIDY0ICAgICAgICAgIDQ1ICAgICAgICAxICAgMC45MTEgICAgNC4yZS0wNSBzZWMuCnQAVSAgVE9WMiAgICAgICAgICAgICAgIDUwLjkwNCAgICAgICAgICA1NiAgICAgICAgICA0MiAgICAgICAgMSAgIDAuOTA5ICAgIDMuNmUtMDUgc2VjLgp0AFUgIFRPVjIrRm9yY2UgICAgICAgICA2MS4zNzQgICAgICAgICAgNTMgICAgICAgICAgNDIgICAgICAgIDEgICAxLjE1OCAgICA0LjJlLTA1IHNlYy4KdABVICBOT0FDSzIgICAgICAgICAgICAxNDUuODk5ICAgICAgICAgMTI5ICAgICAgICAgIDU5ICAgICAgICAxICAgMS4xMzEgICAgMi44ZS0wNSBzZWMuCnQAVSAgTk9BQ0syK0ZvcmNlICAgICAgICA0MS4xNiAgICAgICAgICA0MiAgICAgICAgICAzOSAgICAgICAgMSAgICAwLjk4ICAgIDQuOGUtMDUgc2VjLgp0AFUgIEFDTSAgICAgICAgICAgICAgIDEwNC4xMzMgICAgICAgICAxMDMgICAgICAgICAgNTQgICAgICAgIDEgICAxLjAxMSAgICA1LjhlLTA1IHNlYy4KdABVICBBQ00rRm9yY2UgICAgICAgICAgNjEuMzQ0ICAgICAgICAgIDQ4ICAgICAgICAgIDQxICAgICAgICAxICAgMS4yNzggICAgMy45ZS0wNSBzZWMuCnQAVSAgQ00yICAgICAgICAgICAgICAgICAxMDcuMSAgICAgICAgICA4NCAgICAgICAgICA0OSAgICAgICAgMSAgIDEuMjc1ICAgIDIuOGUtMDUgc2VjLgp0AFUgIENNMitGb3JjZSAgICAgICAgICA1Mi43NTIgICAgICAgICAgNDggICAgICAgICAgNDEgICAgICAgIDEgICAxLjA5OSAgICAzLjhlLTA1IHNlYy4KdABVICBQICAgICAgICAgICAgICAgICAxMzMuMjIzICAgICAgICAgMTI3ICAgICAgICAgIDY2ICAgICAgICAxICAgMS4wNDkgICAgMi41ZS0wNSBzZWMuCnQAVSAgR1AgICAgICAgICAgICAgICAgIDEwNC42NyAgICAgICAgICA5MCAgICAgICAgICA1MiAgICAgICAgMSAgIDEuMTYzICAgIDcuNGUtMDUgc2VjLgp0AFUgIEdQK0ZvcmNlICAgICAgICAgICA1NS4xMjUgICAgICAgICAgNDkgICAgICAgICAgMzkgICAgICAgIDEgICAxLjEyNSAgICA0LjVlLTA1IHNlYy4KdABATWV0YS1oZXVyaXN0aWM6IHNlbGVjdGluZyBtZXRob2QgTk9BQ0syK0ZvcmNlIHdpdGggc2NvcmU6IDQxLjE2CnQAKVRpbWUgdG8gY29tcHV0ZSB2YXJpYWJsZSBvcmRlcjogMC4wMDExNTkKdAABCnQAUD09PT09PT09PT09PT09PT09PT09PT09PT0gU1RBUlQgRklSSU5HIFJVTEVTIEVOQ09ESU5HID09PT09PT09PT09PT09PT09PT09PT09PT0KdAAsRW5jb2RlZCAxMiB0cmFuc2l0aW9uIGluIDEgcHJpb3JpdHkgZ3JvdXBzLgp0ACFUaW1lIHRvIGJ1aWxkIGFsbCBOU0ZzOiAwLjAwMDU3NAp0AAEKdABQPT09PT09PT09PT09PT09PT09PT09PT09PSBSRUFDSEFCSUxJVFkgU0VUIEdFTkVSQVRJT04gPT09PT09PT09PT09PT09PT09PT09PT09PQp0ABVTcGxpdDogU3BsaXRTdWJ0cmFjdAp0AB1SUyBnZW5lcmF0aW9uIHRpbWU6IDAuMDAwMTY1CnQAHUNvbXB1dGluZyB2YXJpYWJsZSBib3VuZHMuLi4KdAABCnQAUD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09IE1FTU9SWSA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KdAApIFRvdGFsIE1lbW9yeSBVc2Vk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cQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMNxAH4Aw3EAfgDDcQB+AMN4 diff --git a/anno3/vpc/consegne/3/3.8.PNPRO b/anno3/vpc/consegne/3/3.8.PNPRO index c47158b..6f0bf25 100644 --- a/anno3/vpc/consegne/3/3.8.PNPRO +++ b/anno3/vpc/consegne/3/3.8.PNPRO @@ -116,6 +116,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rO0ABXNyABRqYXZhLnV0aWwuTGlua2VkTGlzdAwpU11KYIgiAwAAeHB3BAAAAM90AJMbWzBtRVhFQzogL3Vzci9sb2NhbC9HcmVhdFNQTi9iaW4vRFNQTi1Ub29sIC1sb2FkICIvaG9tZS91c2VyL1VOSVRPL2Fubm8zL3ZwYy9jb25zZWduZS8zLzMuOC1NZWFzdXJlcy5zb2x1dGlvbi9QVCIgLXBiYXNpcyAtZGV0ZWN0LWV4cCAtcHNmbCAtYm5kIAp0AHAbWzFtG1s0bUxPQURJTkcgUEVUUkkgTkVUIC9ob21lL3VzZXIvVU5JVE8vYW5ubzMvdnBjL2NvbnNlZ25lLzMvMy44LU1lYXN1cmVzLnNvbHV0aW9uL1BUIChuZXQvZGVmKS4uLhtbMjJtG1syNG0KdAAPTUFSS0lORyBQQVI6IDAKdAAQUExBQ0VTOiAgICAgIDE0CnQAD1JBVEUgUEFSOiAgICAwCnQAEFRSQU5TSVRJT05TOiAxMgp0AA9NRUFTVVJFUzogICAgMAp0AChMT0FESU5HIFRJTUU6IFtVc2VyIDAuMDAwcywgU3lzIDAuMDAwc10KdAABCnQAAQp0AB5DT01QVVRJTkcgUExBQ0UgRkxPVyBCQVNJUy4uLgp0ABJNPTEyLCBOPTE0LCBOMD0xNAp0ADlDb21wdXRhdGlvbiBvZiBGbG93IGJhc2lzOiBzdGVwIDEvMTIsIHxLfD0xMiwgcHJvZHVjdHM9MQp0AFMbWzFBICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCnQAUhtbMUFDb21wdXRhdGlvbiBvZiBGbG93IGJhc2lzOiBjb21wbGV0ZWQgaW4gOCBzdGVwcywgfEt8PTYuICAgICAgICAgICAgICAgICAgICAgIAp0AEBGT1VORCA2IFZFQ1RPUlMgSU4gVEhFIFBMQUNFIEZMT1cgQkFTSVMgKDQgc2VtaWZsb3dzLCAyIGZsb3dzKS4KdAABCnQAAQp0ACdBbGwgcGxhY2VzIGFyZSBjb3ZlcmVkIGJ5IHNvbWUgUC1mbG93Lgp0AAEKdAAmVE9UQUwgVElNRTogW1VzZXIgMC4wMDBzLCBTeXMgMC4wMDBzXQp0ACdBVk9JRCBFWFBPTkVOVElBTCBHUk9XVEggT0YgU0VNSUZMT1dTLgp0AB1DT01QVVRJTkcgUExBQ0UgU0VNSUZMT1dTLi4uCnQAEk09MTIsIE49MTQsIE4wPTE0CnQAK0dlbmVyYXRpb24gb2YgU2VtaWZsb3dzOiBzdGVwIDEvMTIsIHxLfD0xMgp0AFMbWzFBICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCnQAUBtbMUFHZW5lcmF0aW9uIG9mIFNlbWlmbG93czogY29tcGxldGVkIGluIDggc3RlcHMsIHxLfD04LiAgICAgICAgICAgICAgICAgICAgICAKdAAZRk9VTkQgOCBQTEFDRSBTRU1JRkxPV1MuCnQAAQp0AAEKdAArQWxsIHBsYWNlcyBhcmUgY292ZXJlZCBieSBzb21lIFAtc2VtaWZsb3cuCnQAAQp0ACZUT1RBTCBUSU1FOiBbVXNlciAwLjAwMHMsIFN5cyAwLjAwMHNdCnQALENPTVBVVElORyBQTEFDRSBCT1VORFMgRlJPTSBQLVNFTUlGTE9XUyAuLi4KdAAnG1swWBtbMzJtIFBST0NFU1MgRVhJVEVEIE5PUk1BTExZLhtbMG0KdACkG1swbUVYRUM6IHBlcmwgLWUgJ2FsYXJtIDUgOyBleGVjICIvdXNyL2xvY2FsL0dyZWF0U1BOL2Jpbi9EU1BOLVRvb2wgLWxvYWQgXCIvaG9tZS91c2VyL1VOSVRPL2Fubm8zL3ZwYy9jb25zZWduZS8zLzMuOC1NZWFzdXJlcy5zb2x1dGlvbi9QVFwiIC1sb2FkLWJuZCAtaWxwLWJuZCIgJwp0AHAbWzFtG1s0bUxPQURJTkcgUEVUUkkgTkVUIC9ob21lL3VzZXIvVU5JVE8vYW5ubzMvdnBjL2NvbnNlZ25lLzMvMy44LU1lYXN1cmVzLnNvbHV0aW9uL1BUIChuZXQvZGVmKS4uLhtbMjJtG1syNG0KdAAPTUFSS0lORyBQQVI6IDAKdAAQUExBQ0VTOiAgICAgIDE0CnQAD1JBVEUgUEFSOiAgICAwCnQAEFRSQU5TSVRJT05TOiAxMgp0AA9NRUFTVVJFUzogICAgMAp0AChMT0FESU5HIFRJTUU6IFtVc2VyIDAuMDAwcywgU3lzIDAuMDAwc10KdAABCnQAAQp0ABVMT0FESU5HIEJORCBGSUxFIC4uLgp0ACVDT01QVVRJTkcgUExBQ0UgQk9VTkRTIFVTSU5HIElMUCAuLi4KdAAYQWxsIHBsYWNlcyBhcmUgYm91bmRlZC4KcQB+ACR0AHgbWzBtRVhFQzogL3Vzci9sb2NhbC9HcmVhdFNQTi9iaW4vUkdNRUREMyAiL2hvbWUvdXNlci9VTklUTy9hbm5vMy92cGMvY29uc2VnbmUvMy8zLjgtTWVhc3VyZXMuc29sdXRpb24vUFQiIC1NRVRBICAtYyAtQwp0ACBSYW5kb20gc2VlZHM6IDE1ODg5NDc1NDkgNDI2NTA2CnQAUD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KdAARR3JlYXRTUE4vTWVkZGx5Lgp0ADggIENvcHlyaWdodCAoQykgMTk4Ny0yMDE4LCBVbml2ZXJzaXR5IG9mIFRvcmlubywgSXRhbHkuCnQAMSAgU2VuZCBmaWxlcyBuZXRuYW1lLm5ldCwgLmRlZiB0byBlLW1haWwgYWRkcmVzcwp0ACsgIGJlY2N1dGlAZGkudW5pdG8uaXQgaWYgeW91IGZpbmQgYW55IGJ1Zy4KdABQPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQp0AB9CYXNlZCBvbiBNRURETFkgdmVyc2lvbiAwLjE2LjAKdABGICBDb3B5cmlnaHQgKEMpIDIwMDksIElvd2EgU3RhdGUgVW5pdmVyc2l0eSBSZXNlYXJjaCBGb3VuZGF0aW9uLCBJbmMuCnQAKSAgd2Vic2l0ZTogaHR0cDovL21lZGRseS5zb3VyY2Vmb3JnZS5uZXQKdABQPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQp0AClVc2luZyBwZXItZXZlbnQgc2F0dXJhdGlvbiAoc2F0LXByZWdlbikuCnQAG1VzaW5nIGZhc3QgTlNGIGdlbmVyYXRpb24uCnQAElByb2Nlc3MgSUQ6IDE0NDUxCnQAS01PREVMIE5BTUU6IC9ob21lL3VzZXIvVU5JVE8vYW5ubzMvdnBjL2NvbnNlZ25lLzMvMy44LU1lYXN1cmVzLnNvbHV0aW9uL1BUCnQAHSAgMTQgcGxhY2VzLCAxMiB0cmFuc2l0aW9ucy4KdAAnVXNlZCBNZW1vcnkgZm9yIGVuY29kaW5nIG5ldDogMzk0NTY0S0IKdABVT3BlbmluZyBmaWxlOiAvaG9tZS91c2VyL1VOSVRPL2Fubm8zL3ZwYy9jb25zZWduZS8zLzMuOC1NZWFzdXJlcy5zb2x1dGlvbi9QVC5ibmQgT0suCnQAWE9wZW5pbmcgZmlsZTogL2hvbWUvdXNlci9VTklUTy9hbm5vMy92cGMvY29uc2VnbmUvMy8zLjgtTWVhc3VyZXMuc29sdXRpb24vUFQuaWxwYm5kIE9LLgp0ABBJTlBVVCBBUkNTOiAgMTQKdAAQT1VUUFVUIEFSQ1M6IDE0CnQAD0lOSElCIEFSQ1M6ICAwCnQAD1RFU1QgQVJDUzogICA0CnQAEFBMQUNFUzogICAgICAxNAp0ABBUUkFOU0lUSU9OUzogMTIKdAAPSU5WQVJJQU5UUzogIDYKdAAPUC1TRU1JRkxPV1M6IDgKdAAWTUFYIElOVkFSSUFOVCBDQVJEOiAxCnQAAQp0AFA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09IFZBUklBQkxFIE9SREVSID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CnQAPFZhcmlhYmxlIG9yZGVyIG1ldGhvZDogTWV0YS1oZXVyaXN0aWMgdXNpbmcgd2VpZ2h0ZWQgc2NvcmUuCnQAUSAgTUVUSE9EICAgICAgICAgICAgICBTQ09SRSAgICAgICAgU1dJUiAgICAgICBTT1VQUyBESVNDT1VOVCAgV0VJR0hUICAgICAgIFRJTUUgCnQAVSAgU0xPICAgICAgICAgICAgICAgICA2Ny4zMiAgICAgICAgICA2MCAgICAgICAgICA0MyAgICAgICAgMSAgIDEuMTIyICAgICAwLjAwMDMgc2VjLgp0AFUgIFNMTytGb3JjZSAgICAgICAgICAgNDMuMTIgICAgICAgICAgNDkgICAgICAgICAgNDIgICAgICAgIDEgICAgMC44OCAgICA2LjhlLTA1IHNlYy4KdABVICBTTE8tMTYgICAgICAgICAgICAgIDQ3Ljg4ICAgICAgICAgIDYwICAgICAgICAgIDQzICAgICAgICAxICAgMC43OTggICAgNy42ZS0wNSBzZWMuCnQAVSAgU0xPLTE2K0ZvcmNlICAgICAgIDQ0LjYzOSAgICAgICAgICA0OSAgICAgICAgICA0MiAgICAgICAgMSAgIDAuOTExICAgIDQuNmUtMDUgc2VjLgp0AFUgIFRPVjIgICAgICAgICAgICAgICA1NS40NDkgICAgICAgICAgNjEgICAgICAgICAgNDMgICAgICAgIDEgICAwLjkwOSAgICA1LjNlLTA1IHNlYy4KdABVICBUT1YyK0ZvcmNlICAgICAgICAgNTUuNTg0ICAgICAgICAgIDQ4ICAgICAgICAgIDQxICAgICAgICAxICAgMS4xNTggICAgNC41ZS0wNSBzZWMuCnQAVSAgTk9BQ0syICAgICAgICAgICAgMTc2LjQzNiAgICAgICAgIDE1NiAgICAgICAgICA2NyAgICAgICAgMSAgIDEuMTMxICAgIDMuMmUtMDUgc2VjLgp0AFUgIE5PQUNLMitGb3JjZSAgICAgICAgNDYuMDYgICAgICAgICAgNDcgICAgICAgICAgNDAgICAgICAgIDEgICAgMC45OCAgICA0LjNlLTA1IHNlYy4KdABVICBBQ00gICAgICAgICAgICAgICAgNjUuNzE1ICAgICAgICAgIDY1ICAgICAgICAgIDQ0ICAgICAgICAxICAgMS4wMTEgICAgNi43ZS0wNSBzZWMuCnQAVSAgQUNNK0ZvcmNlICAgICAgICAgIDcyLjg0NiAgICAgICAgICA1NyAgICAgICAgICA0MiAgICAgICAgMSAgIDEuMjc4ICAgIDMuMmUtMDUgc2VjLgp0AFUgIENNMiAgICAgICAgICAgICAgICA4Mi44NzUgICAgICAgICAgNjUgICAgICAgICAgNDQgICAgICAgIDEgICAxLjI3NSAgICAyLjNlLTA1IHNlYy4KdABVICBDTTIrRm9yY2UgICAgICAgICAgNjIuNjQzICAgICAgICAgIDU3ICAgICAgICAgIDQyICAgICAgICAxICAgMS4wOTkgICAgMi45ZS0wNSBzZWMuCnQAVSAgUCAgICAgICAgICAgICAgICAgMTE3LjQ4OCAgICAgICAgIDExMiAgICAgICAgICA1OSAgICAgICAgMSAgIDEuMDQ5ICAgIDIuNmUtMDUgc2VjLgp0AFUgIEdQICAgICAgICAgICAgICAgICA1MC4wMDkgICAgICAgICAgNDMgICAgICAgICAgMzcgICAgICAgIDEgICAxLjE2MyAgIDAuMDAwMTU0IHNlYy4KdABVICBHUCtGb3JjZSAgICAgICAgICAgICAgIDU0ICAgICAgICAgIDQ4ICAgICAgICAgIDM4ICAgICAgICAxICAgMS4xMjUgICAgNS40ZS0wNSBzZWMuCnQAPU1ldGEtaGV1cmlzdGljOiBzZWxlY3RpbmcgbWV0aG9kIFNMTytGb3JjZSB3aXRoIHNjb3JlOiA0My4xMgp0ACZUaW1lIHRvIGNvbXB1dGUgdmFyaWFibGUgb3JkZXI6IDAuMDAyCnQAAQp0AFA9PT09PT09PT09PT09PT09PT09PT09PT09IFNUQVJUIEZJUklORyBSVUxFUyBFTkNPRElORyA9PT09PT09PT09PT09PT09PT09PT09PT09CnQALEVuY29kZWQgMTIgdHJhbnNpdGlvbiBpbiAxIHByaW9yaXR5IGdyb3Vwcy4KdAAhVGltZSB0byBidWlsZCBhbGwgTlNGczogMC4wMDA0MDIKdAABCnQAUD09PT09PT09PT09PT09PT09PT09PT09PT0gUkVBQ0hBQklMSVRZIFNFVCBHRU5FUkFUSU9OID09PT09PT09PT09PT09PT09PT09PT09PT0KdAAVU3BsaXQ6IFNwbGl0U3VidHJhY3QKdAAdUlMgZ2VuZXJhdGlvbiB0aW1lOiAwLjAwMDEwNAp0AB1Db21wdXRpbmcgdmFyaWFibGUgYm91bmRzLi4uCnQAAQp0AFA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSBNRU1PUlkgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CnQAKSBUb3RhbCBNZW1vcnkgVXNlZDogICAg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ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0XEAfgDRcQB+ANFxAH4A0Xg diff --git a/anno3/vpc/consegne/3/analisi.org b/anno3/vpc/consegne/3/analisi.org index 5fea12c..7725ddd 100644 --- a/anno3/vpc/consegne/3/analisi.org +++ b/anno3/vpc/consegne/3/analisi.org @@ -502,7 +502,6 @@ AG(#await_P == 1 -> EF(#critical_Q==1 || #critical_P == 1)) #+END_SRC che conferma la presenza di deadlock causata dalle due variabili booleane. \includepdf{3.8.jpg} -** TODO CCS ** Risultati Nella tabella mostriamo i risultati ottenuti | | NuSMV | GreatSPN | @@ -971,3 +970,20 @@ modelli, l'algoritmo raggiunge la terminazione quando non e` piu` possibile partizionare gli insieme in base alle azioni comuni e abbiamo come risultato che in ogni set compare uno stato di un modello insieme ad uno o piu` stati dell'altro. +* Riduzione +Le reti dell'algoritmo 3.6 e 3.8 differiscono per la successione delle +istruzioni di /setTrue/ e /await/ e permettono simmetricamente le +stesse riduzioni: +| rete 3.6 | rete 3.8 | +|---------------------+--------------------------------------| +| rimozione self loop | rimozione self loop | +| fusione posti P1-P2 | fusione posti local_P, setTrue_P | +| fusione posti P4-P5 | fusione posti critical_P, setFalse_P | +| fusione posti Q1-Q2 | fusione posti local_Q, setTrue_Q | +| fusione posti Q4-Q5 | fusione posti critical_Q, setFalse_Q | +Riportiamo le immagini delle due reti ridotte. +Le transizioni relative a /setTrue/ e /await/ non sono riducibili in +quanto hanno archi uscenti. Possiamo affermare che le due reti non +sono equivalenti, come era deducibile dal fatto che rispettano diverse proprieta`. +[[./ridotto_3.6.jpg]] +[[./ridotto_3.8.jpg]]