employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

Use Em instead of destructuring for m1v1 

Similar to previous commit.
master
Mike Gerwitz 2021-01-20 16:03:48 -05:00
parent 3a6695c873
commit 917977effc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/current/compiler/js.xsl
View File

@ -702,12 +702,12 @@
<variable name="input-vector" as="xs:string"
select="compiler:match-name-on( $symtable-map, $v1 )" />
<sequence select="concat( '[', $yield-to, ',', $var, ']=m1v1',
<sequence select="concat( $var, '=Em(', $yield-to, '=m1v1',
$ctype, '(',
$input-matrix, ',', $input-vector,
',', compiler:match-value( $symtable-map, $m1 ),
',', compiler:match-value( $symtable-map, $v1 ),
');' )" />
'));' )" />
</when>
<!-- all vectors with @value -->
@ -1556,26 +1556,24 @@
function m1v1u(m, v, mcmp, vcmp)
{
const result = m.map((mv, i) => (mv.length ? mv : [0]).map(ms => +(ms === mcmp && v[i] === vcmp)));
const any = result.some(mv => mv.some(x => x === 1));
for (let i = result.length; i < v.length; i++) {
result[i] = [0];
}
return [result, any];
return result;
}
// one matrix, one vector, existential quantification
function m1v1e(m, v, mcmp, vcmp)
{
const result = m.map((mv, i) => (mv.length ? mv : [0]).map(ms => +(ms === mcmp || v[i] === vcmp)));
const any = result.some(mv => mv.some(x => x === 1));
for (let i = result.length; i < v.length; i++) {
result[i] = [v[i] === vcmp];
}
return [result, any];
return result;
}
function vu(vs, cmps)
@ -1611,6 +1609,12 @@
return v.some(s => s === 1);
}
// existential (any) for matrices
function Em(m)
{
return m.some(E);
}
/**
* Checks for matches against values for any param value