Merge pull request #78 from JuliaAI/dev

For a 0.1.4 Release
JuliaAI · Jan 9, 2024 · af9a821 · af9a821
2 parents f631a95 + dfe4d00
commit af9a821
Show file tree

Hide file tree

Showing 12 changed files with 135 additions and 34 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Imbalance"
 uuid = "c709b415-507b-45b7-9a3d-1767c89fde68"
 authors = ["Essam Wisam <[email protected]>", "Anthony Blaom <[email protected]> and contributors"]
-version = "0.1.3"
+version = "0.1.4"
 
 
 [deps]

diff --git a/src/oversampling_methods/borderline_smote1/interface_mlj.jl b/src/oversampling_methods/borderline_smote1/interface_mlj.jl
@@ -65,9 +65,20 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
     BorderlineSMOTE1,
-    input_scitype = Union{Table(Continuous),AbstractMatrix{Continuous}},
-    output_scitype = Union{Table(Continuous),AbstractMatrix{Continuous}},
-    target_scitype = AbstractVector,
+    input_scitype = Tuple{
+         Union{
+            Table(Continuous),
+            AbstractMatrix{Continuous}
+        }, 
+        AbstractVector
+    },
+    output_scitype = Tuple{
+        Union{
+            Table(Continuous),
+            AbstractMatrix{Continuous}
+        }, 
+        AbstractVector
+    },
     load_path = "Imbalance.MLJ.BorderlineSMOTE1"
 )
 function MMI.transform_scitype(s::BorderlineSMOTE1)

diff --git a/src/oversampling_methods/random_oversample/interface_mlj.jl b/src/oversampling_methods/random_oversample/interface_mlj.jl
@@ -39,9 +39,20 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
   RandomOversampler,
-  input_scitype = Union{Table(Continuous),AbstractMatrix{Continuous}},
-  output_scitype = Union{Table(Continuous),AbstractMatrix{Continuous}},
-  target_scitype = AbstractVector,
+    input_scitype = Tuple{
+                        Union{
+                            Table(Union{Infinite, Finite}),
+                            AbstractMatrix{Infinite}
+                        }, 
+                        AbstractVector
+                    },
+    output_scitype = Tuple{
+        Union{
+            Table(Continuous),
+            AbstractMatrix{Continuous}
+        }, 
+        AbstractVector
+    },
   load_path = "Imbalance.MLJ.RandomOversampler" 
 )
 function MMI.transform_scitype(s::RandomOversampler)

diff --git a/src/oversampling_methods/random_walk/interface_mlj.jl b/src/oversampling_methods/random_walk/interface_mlj.jl
@@ -44,13 +44,14 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
     RandomWalkOversampler,
-    input_scitype = Union{
+    input_scitype = Tuple{
         Table(Union{Infinite, Finite}),
+        AbstractVector
     },
-    output_scitype = Union{
+    output_scitype = Tuple{
         Table(Union{Infinite, Finite}),
+        AbstractVector
     },
-    target_scitype = AbstractVector,
     load_path = "Imbalance.MLJ.RandomWalkOversampler"
 )
 

diff --git a/src/oversampling_methods/rose/interface_mlj.jl b/src/oversampling_methods/rose/interface_mlj.jl
@@ -54,9 +54,20 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
     ROSE,
-    input_scitype = Union{Table(Continuous),AbstractMatrix{Continuous}},
-    output_scitype = Union{Table(Continuous),AbstractMatrix{Continuous}},
-    target_scitype = AbstractVector,
+    input_scitype = Tuple{
+                        Union{
+                            Table(Continuous),
+                            AbstractMatrix{Continuous}
+                        }, 
+                        AbstractVector
+                    },
+    output_scitype = Tuple{
+        Union{
+            Table(Continuous),
+            AbstractMatrix{Continuous}
+        }, 
+        AbstractVector
+    },
     load_path = "Imbalance.MLJ.ROSE"
 )
 function MMI.transform_scitype(s::ROSE)

diff --git a/src/oversampling_methods/smote/interface_mlj.jl b/src/oversampling_methods/smote/interface_mlj.jl
@@ -59,9 +59,20 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
     SMOTE,
-    input_scitype = Union{Table(Continuous),AbstractMatrix{Continuous}},
-    output_scitype = Union{Table(Continuous),AbstractMatrix{Continuous}},
-    target_scitype = AbstractVector,
+    input_scitype = Tuple{
+                        Union{
+                            Table(Continuous),
+                            AbstractMatrix{Continuous}
+                        }, 
+                        AbstractVector
+                    },
+    output_scitype = Tuple{
+        Union{
+            Table(Continuous),
+            AbstractMatrix{Continuous}
+        }, 
+        AbstractVector
+    },
     load_path = "Imbalance.MLJ.SMOTE"
 )
 function MMI.transform_scitype(s::SMOTE)

diff --git a/src/oversampling_methods/smoten/interface_mlj.jl b/src/oversampling_methods/smoten/interface_mlj.jl
@@ -58,9 +58,20 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
     SMOTEN,
-    input_scitype = Union{Table(Finite),AbstractMatrix{Finite}},
-    output_scitype = Union{Table(Finite),AbstractMatrix{Finite}},
-    target_scitype = AbstractVector,
+    input_scitype = Tuple{
+                        Union{
+                            Table(Finite),
+                            AbstractMatrix{Finite}
+                        }, 
+                        AbstractVector
+                    },
+    output_scitype = Tuple{
+        Union{
+            Table(Finite),
+            AbstractMatrix{Finite}
+        }, 
+        AbstractVector
+    },
     load_path = "Imbalance.MLJ.SMOTEN"
 )
 

diff --git a/src/oversampling_methods/smotenc/interface_mlj.jl b/src/oversampling_methods/smotenc/interface_mlj.jl
@@ -59,13 +59,14 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
     SMOTENC,
-    input_scitype = Union{
+    input_scitype = Tuple{
         Table(Union{Infinite, Finite}),
+        AbstractVector
     },
-    output_scitype = Union{
+    output_scitype = Tuple{
         Table(Union{Infinite, Finite}),
+        AbstractVector
     },
-    target_scitype = AbstractVector,
     load_path = "Imbalance.MLJ.SMOTENC"
 )
 

diff --git a/src/undersampling_methods/cluster_undersample/interface_mlj.jl b/src/undersampling_methods/cluster_undersample/interface_mlj.jl
@@ -63,9 +63,20 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
 	ClusterUndersampler,
-	input_scitype = Union{Table(Continuous), AbstractMatrix{Continuous}},
-	output_scitype = Union{Table(Continuous), AbstractMatrix{Continuous}},
-	target_scitype = AbstractVector,
+    input_scitype = Tuple{
+                        Union{
+                            Table(Continuous),
+                            AbstractMatrix{Continuous}
+                        }, 
+                        AbstractVector
+                    },
+    output_scitype = Tuple{
+        Union{
+            Table(Continuous),
+            AbstractMatrix{Continuous}
+        }, 
+        AbstractVector
+    },
 	load_path = "Imbalance.MLJ.ClusterUndersampler" 
 )
 

diff --git a/src/undersampling_methods/enn_undersample/interface_mlj.jl b/src/undersampling_methods/enn_undersample/interface_mlj.jl
@@ -74,9 +74,20 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
 	ENNUndersampler,
-	input_scitype = Union{Table(Continuous)},
-	output_scitype = Union{Table(Continuous)},
-	target_scitype = AbstractVector,
+    input_scitype = Tuple{
+                        Union{
+                            Table(Continuous),
+                            AbstractMatrix{Continuous}
+                        }, 
+                        AbstractVector
+                    },
+    output_scitype = Tuple{
+        Union{
+            Table(Continuous),
+            AbstractMatrix{Continuous}
+        }, 
+        AbstractVector
+    },
 	load_path = "Imbalance.MLJ.ENNUndersampler" 
 )
 function MMI.transform_scitype(s::ENNUndersampler)

diff --git a/src/undersampling_methods/random_undersample/interface_mlj.jl b/src/undersampling_methods/random_undersample/interface_mlj.jl
@@ -50,9 +50,20 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
     RandomUndersampler,
-    input_scitype = Union{Table(Continuous), AbstractMatrix{Continuous}},
-    output_scitype = Union{Table(Continuous), AbstractMatrix{Continuous}},
-    target_scitype = AbstractVector,
+    input_scitype = Tuple{
+                        Union{
+                            Table(Union{Infinite, Finite}),
+                            AbstractMatrix{Infinite}
+                        }, 
+                        AbstractVector
+                    },
+    output_scitype = Tuple{
+        Union{
+            Table(Continuous),
+            AbstractMatrix{Continuous}
+        }, 
+        AbstractVector
+    },
     load_path = "Imbalance.MLJ.RandomUndersampler"
 )
 function MMI.transform_scitype(s::RandomUndersampler)

diff --git a/src/undersampling_methods/tomek_undersample/interface_mlj.jl b/src/undersampling_methods/tomek_undersample/interface_mlj.jl
@@ -54,9 +54,20 @@ MMI.metadata_pkg(
 
 MMI.metadata_model(
     TomekUndersampler,
-    input_scitype = Union{Table(Continuous), AbstractMatrix{Continuous}},
-    output_scitype = Union{Table(Continuous), AbstractMatrix{Continuous}},
-    target_scitype = AbstractVector,
+    input_scitype = Tuple{
+                        Union{
+                            Table(Continuous),
+                            AbstractMatrix{Continuous}
+                        }, 
+                        AbstractVector
+                    },
+    output_scitype = Tuple{
+        Union{
+            Table(Continuous),
+            AbstractMatrix{Continuous}
+        }, 
+        AbstractVector
+    },
     load_path = "Imbalance.MLJ.TomekUndersampler"
 )
 function MMI.transform_scitype(s::TomekUndersampler)