Test ci

.github/workflows/macos-ci.yml

@@ -0,0 +1,33 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: Build and Test
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build_matrix:
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: SciSharp Mac OS Dependencies
+      run: Install-Package SciSharp.TensorFlow.Redist-OSX
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

.github/workflows/ubuntu-windows-ci.yml

@@ -0,0 +1,32 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: Build and Test
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build_matrix:
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/test/Pandas.NET.Test/bin/Debug/net8.0/Pandas.NET.Test.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/test/Pandas.NET.Test",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Pandas.NET.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/Pandas.NET.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/Pandas.NET.sln"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

src/Pandas.NET/Columns/Column.cs

@@ -10,6 +10,17 @@ public class Column
         public string Name { get; set; }
         public Type DType { get; set; }
 
+
+        public Column()
+        {
+        }
+
+        public Column(string name, Type dtype)
+        {
+            Name = name;
+            DType = dtype;
+        }
+
         public override string ToString()
             => $"{Name} {DType}";
     }

src/Pandas.NET/DataFrames/DataFrame.cs

@@ -45,6 +45,12 @@ public DataFrame(List<Series> data, Series index = null, List<Column> columns =
                 index.size,
                 columns.Count
             };
+
+            foreach (var s in _data)
+            {
+                s.SetIndex(_index);
+            }
+
         }
     }
 }

src/Pandas.NET/DataFrames/DataFrame.operator.cs

@@ -16,7 +16,9 @@ public partial class DataFrame
             {
                 data.Add(a.data[i] - b.data switch
                 {
+                    double[] double64 => double64[i],
                     float[] float32 => float32[i],
+                    int[] int32 => int32[i],
                     _ => throw new NotImplementedException("")
                 });
             }
@@ -32,14 +34,26 @@ public partial class DataFrame
             {
                 data.Add(a.data[i] / b.data switch
                 {
+                    double[] double64 => double64[i],
                     float[] float32 => float32[i],
+                    int[] int32 => int32[i],
                     _ => throw new NotImplementedException("")
                 });
             }
 
             return new DataFrame(data, index: a.index, columns: a.columns);
         }
 
+        public static DataFrame operator *(DataFrame a, Series b)
+        {
+            var data = new List<Series>();
+            for(int i=0;i<a.data.Count; i++)
+            {
+                data.Add(a.data[i] * Convert.ToDouble(b.data.GetValue(i)));
+            }
+            return new DataFrame(data, index: a.index, columns: a.columns);
+        }
+
         public static bool operator ==(DataFrame a, DataFrame b)
         {
             // do they have the same number of columns?
@@ -76,5 +90,18 @@ public partial class DataFrame
         {
             return !(a == b);
         }
+
+        public override bool Equals(object obj)
+        {
+            return obj is DataFrame frame &&
+                   data == frame.data &&
+                   columns == frame.columns &&
+                   index == frame.index;
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(data, columns, index);
+        }
     }
 }

src/Pandas.NET/DataFrames/DataFrame.sample.cs

@@ -1,28 +1,76 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection.PortableExecutable;
+using Tensorflow.Util;
 
 namespace PandasNet;
 
 public partial class DataFrame
 {
-    public DataFrame sample(float frac= 0.8f, int random_state = 0)
+    public DataFrame sample(int n = 0, float frac = 0, int random_state = 0, bool replace = false)
     {
-        var rnd = new Random(random_state);
-        var n = (int)Math.Ceiling((1 - frac) * _index.size);
-        var excludeRowIndexArray = new int[n];
-        for (int i = 0; i < n; i++)
+        if (n == 0 && frac == 0)
+        {
+            throw new ArgumentException("Either n or frac should be greater than 0");
+        }
+        if (n != 0 && frac != 0)
+        {
+            throw new ArgumentException("Only one of n or frac should be greater than 0");
+        }
+        if (frac > 0)
         {
-            excludeRowIndexArray[i] = rnd.Next(0, _index.size - 1);
+            n = (int)Math.Ceiling(frac * _index.size);
         }
+        if (n > _index.size)
+        {
+            throw new ArgumentException("n should be less than the size of the DataFrame");
+        }
+
+        // treat axis as 0 for now.  support for axis=1 should be added in the future
+        var rnd = new Random(random_state);
 
-        var data = new List<Series>();
+        // make a list that we can sample from
+        List<int> sampleIndex = null;
+
+        if(!replace){
+            // randomize the index and take the first n elements, no duplicates
+            sampleIndex = Enumerable
+                .Range(0, _index.size)
+                .OrderBy(arg => rnd.Next())
+                .Take(n).ToList();
+        }
+        else{
+            // for each sample, randomly select an index allowing duplicates
+            var sampleIndexes = Enumerable.Range(0, _index.size);
+            for (int i = 0; i < n; i++)
+            {
+                sampleIndex.Add(sampleIndexes.ElementAt(rnd.Next(0, sampleIndexes.Count()-1)));
+            }
+        }
+
+        // initialize a dictionary to hold the data
+        Dictionary<Column, ArrayList> data = new Dictionary<Column, ArrayList>();
         foreach (var s in _data)
         {
-            var series = s.drop(excludeRowIndexArray);
-            data.Add(series);
+            // init the array based on the dtype
+            ArrayList array =new ArrayList();
+            data.Add(s.column, array);
+        }
+
+        // fill the arrays with the sampled data
+        for (int i = 0; i < sampleIndex.Count; i++)
+        {
+            foreach (var s in _data)
+            {
+                data[s.column].Add(s.data.GetValue(sampleIndex[i]));
+            }
         }
-        var index = _index.array<int>().Where(x => !excludeRowIndexArray.Contains(x)).ToArray();
-        return new DataFrame(data, columns: _columns, index: new Series(index));
+
+        // create a new DataFrame with the sampled data
+        DataFrame df = new DataFrame(data.Select(x => new Series(x.Value.ToArray(x.Key.DType), x.Key)).ToList(), index: new Series(sampleIndex.ToArray()));
+        return df;
+
     }
 }

src/Pandas.NET/Pandas.NET.csproj

@@ -22,6 +22,5 @@
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
     <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.16.0" />
     <PackageReference Include="TensorFlow.Keras" Version="0.15.0" />
-    <PackageReference Include="TensorFlow.NET" Version="0.150.0" />
   </ItemGroup>
 </Project>