Code

Add J+aB and APS methods#99

Code

Merged

gmartinonQM merged 105 commits intomasterscikit-learn-contrib/MAPIE:masterfrom devscikit-learn-contrib/MAPIE:devCopy head branch name to clipboardNov 16, 2021

+2,241-628

Commits

Commits on Sep 13, 2021

• fisrt instance of the classification tutorial

  

  Abdou Akim GOUMBALA

  committed
  51e634a

  Copy full SHA for 51e634a

• Add method cumulated_score

  

  Abdou Akim GOUMBALA

  committed
  41838f6

  Copy full SHA for 41838f6

• Merge branch 'add_method_cumulated_score' of https://github.com/simai-ml/MAPIE into add_method_cumulated_score

  

  Vianney Taquet

  committed
  a51ffaa

  Copy full SHA for a51ffaa

Commits on Sep 14, 2021

• corrections added

  

  Abdou Akim GOUMBALA

  committed
  805e765

  Copy full SHA for 805e765

• corrections to mathmatical expressions

  

  Abdou Akim GOUMBALA

  committed
  f60f246

  Copy full SHA for f60f246

• Update fit and predict

  

  Vianney Taquet

  committed
  2ceb115

  Copy full SHA for 2ceb115

• first implementation of jackknife+-aB

  

  Thomas Morzadec

  committed
  dd0f8a8

  Copy full SHA for dd0f8a8

• fix_error_in_first_implementation

  

  Abdou Akim GOUMBALA

  committed
  c405cb3

  Copy full SHA for c405cb3

Commits on Sep 15, 2021

• next step: choose aggregation function

  

  Thomas Morzadec

  committed
  da84b82

  Copy full SHA for da84b82

Commits on Sep 16, 2021

• ADD: can choose between agg_function mean and median

  

  Thomas Morzadec

  committed
  ba1a5ff

  Copy full SHA for ba1a5ff

• ADD customized aggregation function

  

  Thomas Morzadec

  committed
  d62184a

  Copy full SHA for d62184a

Commits on Sep 20, 2021

• add corrections

  

  Abdou Akim GOUMBALA

  committed
  89f341f

  Copy full SHA for 89f341f

• ADD: Jackknife+-AB

  Show description for 61ad53b
  

  Thomas Morzadec

  committed
  61ad53b

  Copy full SHA for 61ad53b

• UPDATE AUTHORS and HISTORY

  

  Thomas Morzadec

  committed
  8db9e9a

  Copy full SHA for 8db9e9a

Commits on Sep 21, 2021

• add corrections + data splitted in train/calib

  

  Abdou Akim GOUMBALA

  committed
  4adfa10

  Copy full SHA for 4adfa10

• commit before merge of dev

  

  Thomas Morzadec

  committed
  801a93a

  Copy full SHA for 801a93a

• Merge branch 'dev' into j_plus_aB

  Show description for 416bc50
  

  Thomas Morzadec

  committed
  416bc50

  Copy full SHA for 416bc50

Commits on Sep 22, 2021

• CORRECTION: application of Vianney's remarks

  

  Thomas Morzadec

  committed
  3540344

  Copy full SHA for 3540344

• [CORRECTION]: corrections from Vianney remarks.

  Show description for c7eb715
  

  Thomas Morzadec

  committed
  c7eb715

  Copy full SHA for c7eb715

• Merge pull request #95 from scikit-learn-contrib/j_plus_aB

  Show description for c5711e6
  vtaquet

  authored
  c5711e6

  Copy full SHA for c5711e6

Commits on Sep 27, 2021

• class JackknifeAB restricted to a smaller class Resample and argument cv replaced by agg_functionin MapieRegressor

  

  Julien Roussel

  authored and

  Julien Roussel

  committed
  90ab090

  Copy full SHA for 90ab090

• add corrections +

  

  Abdou Akim GOUMBALA

  committed
  d231a40

  Copy full SHA for d231a40

• Merge pull request #92 from scikit-learn-contrib/add_classification_tutorial

  Show description for fb3e541
  vtaquet

  authored
  fb3e541

  Copy full SHA for fb3e541

Commits on Sep 29, 2021

• Correction of JRO MR

  

  Thomas Morzadec

  committed
  9c2f3a4

  Copy full SHA for 9c2f3a4

• update test classification + method aps

  

  Abdou Akim GOUMBALA

  committed
  c431c6c

  Copy full SHA for c431c6c

Commits on Sep 30, 2021

• corrections according to most of Vianney remarks on Julien PR

  

  Thomas Morzadec

  committed
  b9b0999

  Copy full SHA for b9b0999

• update method score with 1-score

  

  Abdou Akim GOUMBALA

  committed
  9da45ec

  Copy full SHA for 9da45ec

Commits on Oct 4, 2021

• Documentation corrected and lines split to avoid black correction

  

  Julien Roussel

  authored and

  Julien Roussel

  committed
  326b537

  Copy full SHA for 326b537

• Add unit test to cumulated_score

  

  Vianney Taquet

  committed
  c874cb9

  Copy full SHA for c874cb9

• Fix typing

  

  Vianney Taquet

  committed
  8ffdc63

  Copy full SHA for 8ffdc63

• Add method comparison on 2d dataset

  

  Vianney Taquet

  committed
  473b6ef

  Copy full SHA for 473b6ef

• Add method comparison on 2d dataset

  

  Vianney Taquet

  committed
  726728b

  Copy full SHA for 726728b

• Add method comparison on 2d dataset

  

  Vianney Taquet

  committed
  6e1ea49

  Copy full SHA for 6e1ea49

• Add method comparison on 2d dataset

  

  Vianney Taquet

  committed
  49de3ba

  Copy full SHA for 49de3ba

• Add method comparison on 2d dataset

  

  Vianney Taquet

  committed
  97df924

  Copy full SHA for 97df924

• Add method comparison on 2d dataset

  

  Vianney Taquet

  committed
  029588e

  Copy full SHA for 029588e

• Add method comparison on 2d dataset

  

  Vianney Taquet

  committed
  7a47a40

  Copy full SHA for 7a47a40

• Include GMA comments

  

  Vianney Taquet

  committed
  7fc290d

  Copy full SHA for 7fc290d

• plot_barber repaired and error type corrected

  

  Julien Roussel

  authored and

  Julien Roussel

  committed
  dfd4c27

  Copy full SHA for dfd4c27

• Fix HISTORY

  

  Vianney Taquet

  committed
  a1dbd95

  Copy full SHA for a1dbd95

• Merge branch 'dev' into add_method_cumulated_score

  vtaquet

  authored
  15f8d13

  Copy full SHA for 15f8d13

• Merge pull request #93 from scikit-learn-contrib/add_method_cumulated_score

  Show description for 1a7fff6
  vtaquet

  authored
  1a7fff6

  Copy full SHA for 1a7fff6

Commits on Oct 5, 2021

• documentation of Subsample.get_n_samples improved

  

  Julien Roussel

  authored and

  Julien Roussel

  committed
  13bc8a4

  Copy full SHA for 13bc8a4

Commits on Oct 7, 2021

• merge

  

  Julien Roussel

  authored and

  Julien Roussel

  committed
  f429290

  Copy full SHA for f429290

Commits on Oct 11, 2021

• Add randomness in quantile estimate and inclusion of last label

  

  Vianney Taquet

  committed
  23e2e5e

  Copy full SHA for 23e2e5e

• Add unit tests

  

  Vianney Taquet

  committed
  5af6786

  Copy full SHA for 5af6786

• Fix CI issues

  

  Vianney Taquet

  committed
  9ed548c

  Copy full SHA for 9ed548c

• Fix CI issues

  

  Vianney Taquet

  committed
  07dc4af

  Copy full SHA for 07dc4af

• Finish example.

  

  Vianney Taquet

  committed
  b310a0a

  Copy full SHA for b310a0a

• Finish example.

  

  Vianney Taquet

  committed
  4a42a83

  Copy full SHA for 4a42a83

• gitignore merged

  

  Julien Roussel

  authored and

  Julien Roussel

  committed
  d79ee69

  Copy full SHA for d79ee69

Commits on Oct 12, 2021

• Merge pull request #96 from scikit-learn-contrib/reviewing_regression_jro

  Show description for fbde8e9
  vtaquet

  authored
  fbde8e9

  Copy full SHA for fbde8e9

• Add size in np.random.uniform

  

  Vianney Taquet

  committed
  8d3ce2d

  Copy full SHA for 8d3ce2d

• Change inequality to estimate prediction sets

  

  Vianney Taquet

  committed
  0eb54a4

  Copy full SHA for 0eb54a4

• Merge pull request #98 from scikit-learn-contrib/randomness-in-cumulated_score

  Show description for f810cfb
  vtaquet

  authored
  f810cfb

  Copy full SHA for f810cfb

Commits on Oct 18, 2021

• integration of GMA remarks

  

  Thomas Morzadec

  committed
  c0c73b0

  Copy full SHA for c0c73b0

Commits on Oct 19, 2021

• add some examples

  

  EC2 Default User

  committed
  b62eef6

  Copy full SHA for b62eef6

Commits on Oct 25, 2021

• Reply to GMA remarks. Notably add examples to all functions

  

  Thomas Morzadec

  committed
  6f3fdb2

  Copy full SHA for 6f3fdb2

• correcting typing

  

  Thomas Morzadec

  committed
  2898b9a

  Copy full SHA for 2898b9a

• all tests should pass

  

  Thomas Morzadec

  committed
  16ac0fc

  Copy full SHA for 16ac0fc

Commits on Oct 26, 2021

• Prise en compte des remarques de Grégoire Martinon sur les deux dernières PR

  

  Thomas Morzadec

  committed
  6475d99

  Copy full SHA for 6475d99

• Prise en compte des remarques de Grégoire Martinon sur les deux dernières PR, et correction d'un type

  

  Thomas Morzadec

  committed
  e504503

  Copy full SHA for e504503

• Take first comments from GMA on PR

  

  Vianney Taquet

  committed
  a3582de

  Copy full SHA for a3582de

Commits on Oct 27, 2021

• Ajout d'un commentaire sur les méthodes d'aggrégation et correction de typo

  

  Thomas Morzadec

  committed
  a1c9e31

  Copy full SHA for a1c9e31

• Merge pull request #106 from scikit-learn-contrib/reply_TMO_to_GMA_PR_regression

  Show description for c9854a2
  gmartinonQM

  authored
  c9854a2

  Copy full SHA for c9854a2

Commits on Oct 28, 2021

• Correct code with GMA coments

  

  Vincent Blot

  committed
  e872ace

  Copy full SHA for e872ace

• merge TMO branch into this branch

  

  Vincent Blot

  committed
  a743037

  Copy full SHA for a743037

Commits on Oct 29, 2021

• FIX: interpolation higher and random state

  

  Vincent Blot

  committed
  ffbb682

  Copy full SHA for ffbb682

• ENH: add comments in test functions

  

  Vincent Blot

  committed
  162fc5a

  Copy full SHA for 162fc5a

• Fix plot_comp_methods example

  

  Vianney Taquet

  committed
  be1318d

  Copy full SHA for be1318d

• ENH: add typing

  

  Vincent Blot

  committed
  6ede71d

  Copy full SHA for 6ede71d

• FIX: add missing typing

  

  Vincent Blot

  committed
  07aaa67

  Copy full SHA for 07aaa67

• Last fixes after PR

  

  Vianney Taquet

  committed
  6abd21b

  Copy full SHA for 6abd21b

• Merge pull request #107 from scikit-learn-contrib/comments-gma-on-classification

  Show description for cb320cc
  vtaquet

  authored
  cb320cc

  Copy full SHA for cb320cc

Commits on Nov 2, 2021

• ENH : resolve typo comments + put include_last_label argument in predict

  

  Vincent Blot

  committed
  b625571

  Copy full SHA for b625571

• ENH : remove some arguments from _add_random_tie_breaking function

  

  Vincent Blot

  committed
  d3fc778

  Copy full SHA for d3fc778

• ENH change y_proba_sorted_argmax to y_proba_sorted_last

  

  Vincent Blot

  committed
  5c80725

  Copy full SHA for 5c80725

Commits on Nov 3, 2021

• ENH: change verificaiton that all probas sum to one

  

  Vincent Blot

  committed
  4ac6ebb

  Copy full SHA for 4ac6ebb

• Add docstirng and typing to new tests

  

  Vincent Blot

  committed
  79f0a17

  Copy full SHA for 79f0a17

• FIX: correct typing issues in tests

  

  Vincent Blot

  committed
  4cb8cad

  Copy full SHA for 4cb8cad

• FIX: correct typing issues in tests (2)

  

  Vincent Blot

  committed
  75ac320

  Copy full SHA for 75ac320

• FIX: correct typing issues in tests (3)

  

  Vincent Blot

  committed
  df416cf

  Copy full SHA for df416cf

• FIX: change call to argument includ_last_label from MapieClassifier to .predict

  

  Vincent Blot

  committed
  8282467

  Copy full SHA for 8282467

Commits on Nov 4, 2021

• ENH: change argmax on boolean into argmax on masked array

  

  Vincent Blot

  committed
  d012198

  Copy full SHA for d012198

• ENH: remove argsort on already sorted array

  

  Vincent Blot

  committed
  31b83ab

  Copy full SHA for 31b83ab

Commits on Nov 5, 2021

• Reply to the last remarks of Gregoire Martinon on

  Show description for 7a0f470
  

  Thomas Morzadec

  committed
  7a0f470

  Copy full SHA for 7a0f470

• Minor linting modifications.

  

  Vianney Taquet

  committed
  7d219b9

  Copy full SHA for 7d219b9

• Vectorize randomization of last label incorporation.

  

  Vianney Taquet

  committed
  037a2a6

  Copy full SHA for 037a2a6

Commits on Nov 8, 2021

• Take GMA comments into account

  

  Vianney Taquet

  committed
  2154f4f

  Copy full SHA for 2154f4f

• ENH: take into account GMO comments

  

  Vincent Blot

  committed
  f1605df

  Copy full SHA for f1605df

• FIX: fix typing issue

  

  Vincent Blot

  committed
  e7b5975

  Copy full SHA for e7b5975

• ENH: change u = 1- uniform into u = uniform

  

  Vincent Blot

  committed
  d811813

  Copy full SHA for d811813

• ENH: correct typos in comments

  

  Vincent Blot

  committed
  4f70db3

  Copy full SHA for 4f70db3

Commits on Nov 9, 2021

• all remarks taken into account

  

  Thomas Morzadec

  committed
  958a0e8

  Copy full SHA for 958a0e8

• Merge branch 'dev' of https://github.com/scikit-learn-contrib/MAPIE into dev

  Show description for d4d5854
  

  Thomas Morzadec

  committed
  d4d5854

  Copy full SHA for d4d5854

• ENH: change from sorted to unsorted array for randomized and include_last_label=True arguments

  

  Vincent Blot

  committed
  aa3a00e

  Copy full SHA for aa3a00e

Commits on Nov 10, 2021

• ENH : work on unsorted probabilities

  

  Vincent Blot

  committed
  667dd04

  Copy full SHA for 667dd04

• Merge branch 'dev' of github.com:scikit-learn-contrib/MAPIE into dev

  Show description for e183783
  

  Vincent Blot

  committed
  e183783

  Copy full SHA for e183783

• FIX typing issue withh np.int64

  

  Vincent Blot

  committed
  9d103aa

  Copy full SHA for 9d103aa

• FIX : typing issue

  

  Vincent Blot

  committed
  bfc03a5

  Copy full SHA for bfc03a5

• FIX : typing issue

  

  Vincent Blot

  committed
  b4b75b3

  Copy full SHA for b4b75b3

• FIX : typing issue

  

  Vincent Blot

  committed
  7a207e4

  Copy full SHA for 7a207e4

Commits on Nov 15, 2021

• ENH : take into account GMO comments

  

  Vincent Blot

  committed
  098330e

  Copy full SHA for 098330e

• ENH : take into account GMO comments

  

  Vincent Blot

  committed
  3b638e6

  Copy full SHA for 3b638e6

Commits on Nov 16, 2021

• ENH: directly add proba cumsed in random_tie_breaking function

  

  Vincent Blot

  committed
  74ce283

  Copy full SHA for 74ce283