add iloc to series

Author: steveoni

danfojs/src/core/frame.js

@@ -2021,9 +2021,8 @@ export class DataFrame extends Ndframe {
         if (!utils.__key_in_object(kwargs, "mapper")) {
             throw Error("Please specify a mapper object")
         }
-        this.print()
-        console.log(kwargs['axis']);
-        console.log(kwargs['inplace']);
+        // console.log(kwargs['axis']);
+        // console.log(kwargs['inplace']);
         if (kwargs['axis'] == 1) {
             //columns
             let old_col_names = Object.keys(kwargs['mapper'])
@@ -2039,19 +2038,15 @@ export class DataFrame extends Ndframe {
                 col_names[idx] = new_col_names[i]
 
             })
-            console.log("Before rename");
-            this.print()
+       
             if (kwargs['inplace']) {
                 this.columns = col_names
                 this.__set_col_property(this, this.col_data, col_names, old_col_names)
-                console.log("after rename inplace");
-                this.print()
+     
             } else {
                 let df = this.copy()
                 df.columns = col_names
                 df.__set_col_property(df, df.col_data, col_names, old_col_names)
-                console.log("after rename not inplace");
-                df.print()
                 return df
             }
         } else {

danfojs/src/core/indexing.js

@@ -136,31 +136,39 @@ export const indexLoc = (ndframe, kwargs) => {
             throw new Error(`Specified row index ${row_val} is bigger than maximum row index of ${max_rowIndex}`);
         }
 
-        let value = data_values[row_val]
-        let row_data = []
+        if(Array.isArray(data_values[0])){
 
-        for (var i in columns) {
-            var col_index;
-            if (kwargs["type"] == "loc" && !isColumnSplit) {
-                col_index = ndframe.columns.indexOf(columns[i]); //obtain the column index
+            let value = data_values[row_val]
+            let row_data = []
 
-                if (col_index == -1) {
-                    throw new Error(`Column ${columns[i]} does not exist`);
-                }
-            } else {
-                col_index = columns[i];
-                let max_colIndex = ndframe.columns.length - 1; //assign the maximum column index to a value
 
-                if (col_index > max_colIndex) {
-                    throw new Error(`column index ${col_index} is bigger than ${max_colIndex}`);
+            for (var i in columns) {
+                var col_index;
+                if (kwargs["type"] == "loc" && !isColumnSplit) {
+                    col_index = ndframe.columns.indexOf(columns[i]); //obtain the column index
+
+                    if (col_index == -1) {
+                        throw new Error(`Column ${columns[i]} does not exist`);
+                    }
+                } else {
+                    col_index = columns[i];
+                    let max_colIndex = ndframe.columns.length - 1; //assign the maximum column index to a value
+
+                    if (col_index > max_colIndex) {
+                        throw new Error(`column index ${col_index} is bigger than ${max_colIndex}`);
+                    }
                 }
+
+                let elem = value[col_index]; //obtain the element at the column index
+                row_data.push(elem);
             }
 
-            let elem = value[col_index]; //obtain the element at the column index
-            row_data.push(elem);
-        }
+            new_data.push(row_data); //store the data for each row in the new_data
 
-        new_data.push(row_data); //store the data for each row in the new_data
+        }else{
+
+            new_data.push(data_values[row_val])
+        }
 
     }
 

danfojs/src/core/series.js

@@ -8,7 +8,7 @@ import { table } from 'table'
 import { Configs } from '../config/config'
 import { TimeSeries } from './timeseries';
 import { Plot } from '../plotting/plot'
-
+import { indexLoc } from '../core/indexing'
 
 
 const utils = new Utils()
@@ -1307,5 +1307,24 @@ export class Series extends NDframe {
         return plt
     }
 
+    /**
+     * Slice series accross the index
+     * @param {*} row --> Array
+     * @returns Series
+     */
+    iloc(row){
+
+        let kwargs = {}
+
+        kwargs["rows"] = row
+        kwargs["type"] = "iloc"
+
+        let [new_data, columns, rows] = indexLoc(this, kwargs);
+
+        let sf = new Series(new_data, {columns: columns});
+        sf.__set_index(rows)
+
+        return sf
+    }
 }
 

danfojs/tests/core/series.js

@@ -1148,4 +1148,27 @@ describe("Series", function () {
 
 
     })
+
+    describe("iloc", function(){
+
+        it("indexing by list of index",function(){
+            let data =  [1,2,3,4,"a","b","c"]
+            let sf = new Series(data)
+            
+            let expected_val = [ 2, 'a', 3, 4, 'b' ]
+
+            assert.deepEqual(sf.iloc([1,4,2,3,5]).values, expected_val)
+
+        });
+        it("indexing by slicing", function(){
+
+            let data =  [1,2,3,4,"a","b","c"]
+            let sf = new Series(data)
+            
+            let expected_val = [ 2, 3, 4 ]
+
+            assert.deepEqual(sf.iloc(["1:4"]).values, expected_val)
+
+        });
+    });
 })