Skip to content

Commit 62b7882

Browse files
committed
Merge branch 'feature/optmize-parallel'
2 parents ae14ae4 + 207c728 commit 62b7882

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

javascript/src/bdd/bdd.optimize.state.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
"doesMatchNow": 0.016383298518136143
2121
},
2222
"minimalBddString": "14a1b,c+d2e5f0g/h.i4j*k-l)m(n6obh9pce9qnh9rad9scm9tae9uan9vbf9wbe9xbn9ycg9zck9{cn9|nd9}ne9~nf9ng9¡nm9¢nk9£mh9¤mi9¥mj9¦mk9§ml9¨mn9©mc8ª¤{8«¥z8¬¨s8­¨n8®mn8¯¨¡8°¨m8±pz7²ª«7³{z7´­®7µ}n7¶¤¥7·¨m7¸wo6¹µ}6ºnq6»²¬6¼tu6½wx6¾´¯6¿µn6À®¯6Á¶§6·£6ö¨6Ä·¨6Åm¦6Æm¨6Ǥ¥5Ȩm5Ém©4Êm®4Ëǧ4ÌÈ£4ÍǬ4Îû4Ïȯ4Ðľ4Ñm¦4Òm¯4ÓÆÀ4Ôma3Õmn3ÖÉa3×Ên3ØËr3ÙÁt3ÚÌ|3Û¹3ÜÍr3Ýμ3ÞÏ|3ßп3àØÙ2áv¸2ây±2ãÚÛ2ä~º2åµ2æÜÝ2çv½2èy³2éz{2êÞß2ë~n2ìn2íÑÅ2îÒÓ2ï¢n2ðÔb1ñÕn1òÖb1ó×n1ôàá1õâz1öãä1÷æç1øèé1ùêë1úðc0ûñn0üòc0ýón0þmn0ÿÊn0Āôõ0āöå0Ă÷ø0ăùì0Ąíï0ąîï0Ćúû/ćüý/ĈĀā/ĉĂă/ĊÁÂ/ċÃÄ/Čúm.čüm.ĎĆm.ďćm.Đþm.đÿm.ǧ.ēð.ĔĈ§.ĕĉ°.ĖĄ§.ėą°.ĘÁ§.ęè.ĚĊ§.ěċ¨.Ĝŧ.ĝƨ.ĞČč-ğĎď-ĠĐđ-ġĒē-ĢĔĕ-ģĖė-ĤĘę-ĥĚě-ĦĜĝ-ħğĠ,ĨĢģ,ĩĥĦ,ĪĞħ+īġĨ+ĬĤĩ+ĭĪī)ĭĬ(",
23-
"quality": 587.3026994052454
23+
"quality": 588.8010768471192
2424
}

javascript/src/truth-table-generator/runner.node.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,17 +341,18 @@ async function run() {
341341
console.log('#'.repeat(100));
342342
console.log('## Yeah! found better bdd ##');
343343
lastBetterFoundTime = new Date().getTime();
344-
const bddMinimalString = bddToMinimalString(currentBest);
345-
const quality = getQuality(currentBest, performanceMeasurement);
346-
console.log('nodes: ' + currentBest.countNodes());
344+
const quality = getQuality(res.bdd, performanceMeasurement);
345+
console.log('nodes: ' + res.bdd.countNodes());
347346
console.log('quality(new): ' + quality);
348347
console.log('quality(old): ' + getQuality(currentBest, performanceMeasurement));
349-
console.log('new string: ' + bddMinimalString);
350-
currentBest = res.bdd;
351-
352348
const currentOptimizeState = JSON.parse(fs.readFileSync(BDD_OPTIMIZE_STATE_LOCATION, 'utf-8'));
349+
console.log('currentOptimizeState.quality' + currentOptimizeState.quality);
350+
351+
currentBest = res.bdd;
353352
if (quality > currentOptimizeState.quality) {
354353
console.log('########## BETTER THEN BEFORE ! -> Save it');
354+
const bddMinimalString = bddToMinimalString(res.bdd);
355+
console.log('new string: ' + bddMinimalString);
355356
writeBddTemplate(
356357
bddMinimalString,
357358
performanceMeasurement,

0 commit comments

Comments
 (0)