Skip to content

Commit acb651f

Browse files
committed
refactor: Rename variables with camelCase
refactor: Make series array generation more succinct
1 parent 52ca0c4 commit acb651f

1 file changed

Lines changed: 20 additions & 26 deletions

File tree

src/danfojs-base/core/frame.ts

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,51 +1380,45 @@ export default class DataFrame extends NDframe implements DataFrameInterface {
13801380
}
13811381

13821382
if (typeof other === "number" && axis === 1) {
1383-
const orig_tensor = this.tensor.clone();
1384-
let unit = [NaN];
1385-
for (let i = 1; i < orig_tensor.shape[orig_tensor.rank - 1]; i++) {
1386-
unit.push(NaN);
1387-
}
1388-
let diff_array: any[] = orig_tensor.arraySync();
1383+
const originalTensor = this.tensor.clone();
1384+
const unit = new Array(originalTensor.shape[originalTensor.rank - 1]).fill(NaN);
1385+
let diffArray: any[] = originalTensor.arraySync();
13891386
if (other > 0) {
13901387
for (let i = 0; i < other; i++) {
1391-
diff_array.unshift(unit);
1392-
diff_array.pop();
1388+
diffArray.unshift(unit);
1389+
diffArray.pop();
13931390
}
13941391
}
13951392
else if (other < 0) {
13961393
for (let i = 0; i > other; i--) {
1397-
diff_array.push(unit);
1398-
diff_array.shift();
1394+
diffArray.push(unit);
1395+
diffArray.shift();
13991396
}
14001397
}
1401-
const diff_tensor = tensorflow.tensor2d(diff_array, orig_tensor.shape);
1402-
return this.$MathOps([orig_tensor, diff_tensor], "sub", inplace);
1398+
const diffTensor = tensorflow.tensor2d(diffArray, originalTensor.shape);
1399+
return this.$MathOps([originalTensor, diffTensor], "sub", inplace);
14031400
}
14041401

14051402
if (typeof other === "number" && axis === 0) {
1406-
const orig_df = new DataFrame(this.tensor.clone());
1407-
const orig_tensor = orig_df.T.tensor.clone();
1408-
let unit = [NaN];
1409-
for (let i = 1; i < orig_tensor.shape[orig_tensor.rank - 1]; i++) {
1410-
unit.push(NaN);
1411-
}
1412-
let diff_array: any[] = orig_tensor.arraySync();
1403+
const origDF = this.copy() as DataFrame;
1404+
const originalTensor = origDF.T.tensor.clone();
1405+
const unit = new Array(originalTensor.shape[originalTensor.rank - 1]).fill(NaN);
1406+
let diffArray: any[] = originalTensor.arraySync();
14131407
if (other > 0) {
14141408
for (let i = 0; i < other; i++) {
1415-
diff_array.unshift(unit);
1416-
diff_array.pop();
1409+
diffArray.unshift(unit);
1410+
diffArray.pop();
14171411
}
14181412
}
14191413
else if (other < 0) {
14201414
for (let i = 0; i > other; i--) {
1421-
diff_array.push(unit);
1422-
diff_array.shift();
1415+
diffArray.push(unit);
1416+
diffArray.shift();
14231417
}
14241418
}
1425-
const diff_tensor = tensorflow.tensor2d(diff_array, orig_tensor.shape);
1426-
const diff_df = this.$MathOps([orig_tensor, diff_tensor], "sub", inplace) as DataFrame;
1427-
return diff_df.T;
1419+
const diffTensor = tensorflow.tensor2d(diffArray, originalTensor.shape);
1420+
const diffDF = this.$MathOps([originalTensor, diffTensor], "sub", inplace) as DataFrame;
1421+
return diffDF.T;
14281422
}
14291423

14301424
if (other instanceof DataFrame || other instanceof Series) {

0 commit comments

Comments
 (0)