fix dot/cos axes in Merge (close #18)

This commit is contained in:
Leon Chen
2016-10-23 23:50:54 -04:00
parent 49c7b9a015
commit b5f3234c08
2 changed files with 3 additions and 2 deletions
+2 -1
View File
@@ -720,8 +720,9 @@
}
],
"metadata": {
"anaconda-cloud": {},
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python [default]",
"language": "python",
"name": "python3"
},
+1 -1
View File
@@ -67,7 +67,7 @@ export default class Merge extends Layer {
if (this.dotAxes < 0) {
this.dotAxes = [shapes[0].length + this.dotAxes, shapes[1].length + this.dotAxes]
} else {
this.dotAxes = [this.dotAxes - 1, this.dotAxes - 1]
this.dotAxes = [this.dotAxes, this.dotAxes]
}
}
if (shapes[0][this.dotAxes[0]] !== shapes[1][this.dotAxes[1]]) {