Skip to content

Commit

Permalink
children -> childrenAD
Browse files Browse the repository at this point in the history
  • Loading branch information
joshsunshine committed Jan 10, 2022
1 parent 0e9cc24 commit fb96cba
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions packages/core/src/engine/Autodiff.ts
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@ export const min = (v: VarAD, w: VarAD, isCompNode = true): VarAD => {
* Return `maxN(xs)`.
*/
export const maxN = (xs: VarAD[], isCompNode = true): VarAD => {

if (xs.length === 0) {
log.trace("node", xs);
throw Error("argument list to maxN is empty; expected 1+ elements");
Expand All @@ -480,13 +479,13 @@ export const maxN = (xs: VarAD[], isCompNode = true): VarAD => {
if (isCompNode) {
for (const x of xs) {
const xNode = ifCond(lt(x, z, false), gvarOf(0.0), gvarOf(1.0), false);
x.parents.push({ node: z, sensitivityNode: just(xNode) });
z.children.push({ node: x, sensitivityNode: just(xNode) });
x.parentsAD.push({ node: z, sensitivityNode: just(xNode) });
z.childrenAD.push({ node: x, sensitivityNode: just(xNode) });
}
} else {
for (const x of xs) {
x.parentsGrad.push({ node: z, sensitivityNode: none });
z.childrenGrad.push({ node: x, sensitivityNode: none });
x.parentsADGrad.push({ node: z, sensitivityNode: none });
z.childrenADGrad.push({ node: x, sensitivityNode: none });
}
}
return z;
Expand All @@ -497,7 +496,6 @@ export const maxN = (xs: VarAD[], isCompNode = true): VarAD => {
* Return `minN(xs)`.
*/
export const minN = (xs: VarAD[], isCompNode = true): VarAD => {

if (xs.length === 0) {
log.trace("node", xs);
throw Error("argument list to minN is empty; expected 1+ elements");
Expand All @@ -511,14 +509,14 @@ export const minN = (xs: VarAD[], isCompNode = true): VarAD => {

if (isCompNode) {
for (const x of xs) {
const xNode = ifCond(gt(x, z, false), gvarOf(0.0), gvarOf(1.0), false)
x.parents.push({ node: z, sensitivityNode: just(xNode) });
z.children.push({ node: x, sensitivityNode: just(xNode) });
const xNode = ifCond(gt(x, z, false), gvarOf(0.0), gvarOf(1.0), false);
x.parentsAD.push({ node: z, sensitivityNode: just(xNode) });
z.childrenAD.push({ node: x, sensitivityNode: just(xNode) });
}
} else {
for (const x of xs) {
x.parentsGrad.push({ node: z, sensitivityNode: none });
z.childrenGrad.push({ node: x, sensitivityNode: none });
x.parentsADGrad.push({ node: z, sensitivityNode: none });
z.childrenADGrad.push({ node: x, sensitivityNode: none });
}
}
return z;
Expand Down

0 comments on commit fb96cba

Please sign in to comment.