From e06db258c96341792a4c44f89fcd0f82c1d06d93 Mon Sep 17 00:00:00 2001 From: blinodelka <45514183+blinodelka@users.noreply.github.com> Date: Mon, 19 Jun 2023 15:32:18 +0400 Subject: [PATCH 1/8] added mixture experimentalist contribution --- mkdocs.yml | 1 + pyproject.toml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/mkdocs.yml b/mkdocs.yml index 387310a1a..5ad110f11 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -103,6 +103,7 @@ nav: - Quickstart: 'falsification/docs/sampler/quickstart.md' - Examples: - Basic Usage: 'falsification/docs/sampler/Basic Usage.ipynb' + - Mixture: '!import https://github.com/blinodelka/mixture_experimental_strategies/?branch=main&extra_imports=["mkdocs/base.yml"]' - Poolers: - Grid: - Home: 'core/docs/experimentalists/pooler/grid/index.md' diff --git a/pyproject.toml b/pyproject.toml index 7b74cee55..842e1ba3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,6 +53,7 @@ all-experimentalists = [ "autora[experimentalist-sampler-model-disagreement]", "autora[experimentalist-sampler-uncertainty]", "autora[experimentalist-falsification]", + "autora[experimentalist-mixture]", ] experimentalist-sampler-inequality =[ "autora-experimentalist-sampler-inequality" @@ -73,6 +74,10 @@ experimentalist-falsification =[ "autora-experimentalist-falsification" ] +experimentalist-mixture =[ + "mixture-experimentalist==1.0.0a1" +] + all-experiment-runners = [ "autora[experiment-runner-firebase-prolific]" ] From 3eab2e4bcd50a9f4c14f8f7dfb9b5f8272f4b2d6 Mon Sep 17 00:00:00 2001 From: Younes Strittmatter Date: Tue, 20 Jun 2023 08:24:26 -0400 Subject: [PATCH 2/8] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 842e1ba3a..188d43eea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -75,7 +75,7 @@ experimentalist-falsification =[ ] experimentalist-mixture =[ - "mixture-experimentalist==1.0.0a1" + "mixture-experimentalist==1.0.0a2" ] all-experiment-runners = [ From 77feda688a698437aeec75ba991e3d3876b94181 Mon Sep 17 00:00:00 2001 From: Younes Strittmatter Date: Thu, 22 Jun 2023 17:31:06 -0400 Subject: [PATCH 3/8] Update mkdocs.yml --- mkdocs.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mkdocs.yml b/mkdocs.yml index fcfbfed9c..384ce4981 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -79,6 +79,9 @@ plugins: - name: uncertainty import_url: "https://github.com/autoresearch/autora-experimentalist-sampler-uncertainty/?branch=main" imports: [ "src/" ] + - name: mixture + import_url: "https://github.com/blinodelka/mixture_experimental_strategies/?branch=main" + imports: [ "src/" ] gen-files: scripts: [ "mkdocs/generate_code_reference.py" ] literate-nav: {} @@ -98,6 +101,7 @@ plugins: "./temp_dir/disagreement/src/", "./temp_dir/uncertainty/src/", "./temp_dir/falsification/src/", + "./temp_dir/mixture/src/" ] import: - https://scikit-learn.org/stable/objects.inv From 7a7480e3c4c6c512d66fa3223d9e6ad4b334425b Mon Sep 17 00:00:00 2001 From: Marina Dubova <45514183+blinodelka@users.noreply.github.com> Date: Tue, 27 Jun 2023 06:49:39 -0400 Subject: [PATCH 4/8] Update pyproject.toml Co-authored-by: Younes Strittmatter --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4496122fe..f98d34f38 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,7 +74,7 @@ experimentalist-falsification =[ "autora-experimentalist-falsification" ] -experimentalist-mixture =[ +experimentalist-sampler-mixture =[ "mixture-experimentalist==1.0.0a2" ] From d6869ee35f02c216a81103d718683fccd60837ca Mon Sep 17 00:00:00 2001 From: Marina Dubova <45514183+blinodelka@users.noreply.github.com> Date: Tue, 27 Jun 2023 06:49:51 -0400 Subject: [PATCH 5/8] Update pyproject.toml Co-authored-by: Younes Strittmatter --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f98d34f38..17330ae69 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ all-experimentalists = [ "autora[experimentalist-sampler-model-disagreement]", "autora[experimentalist-sampler-uncertainty]", "autora[experimentalist-falsification]", - "autora[experimentalist-mixture]", + "autora[experimentalist-sampler-mixture]", ] experimentalist-sampler-inequality =[ "autora-experimentalist-sampler-inequality" From bd4513c22dcde0af2d174968210746cfe0e71ddc Mon Sep 17 00:00:00 2001 From: Marina Dubova <45514183+blinodelka@users.noreply.github.com> Date: Tue, 27 Jun 2023 06:50:01 -0400 Subject: [PATCH 6/8] Update pyproject.toml Co-authored-by: Younes Strittmatter --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 17330ae69..6a66318ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -75,7 +75,7 @@ experimentalist-falsification =[ ] experimentalist-sampler-mixture =[ - "mixture-experimentalist==1.0.0a2" + "mixture-experimentalist==1.0.0a3" ] all-experiment-runners = [ From 725d300d221296c2a8ff25100b27d6870711cd90 Mon Sep 17 00:00:00 2001 From: Marina Dubova <45514183+blinodelka@users.noreply.github.com> Date: Tue, 27 Jun 2023 06:50:35 -0400 Subject: [PATCH 7/8] Update pyproject.toml Co-authored-by: benwandrew --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6a66318ad..f4cbbcad1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,7 +73,6 @@ experimentalist-sampler-uncertainty =[ experimentalist-falsification =[ "autora-experimentalist-falsification" ] - experimentalist-sampler-mixture =[ "mixture-experimentalist==1.0.0a3" ] From 7acd58167f05e807cbbee0e71c4b494ff1ac53d6 Mon Sep 17 00:00:00 2001 From: Marina Dubova <45514183+blinodelka@users.noreply.github.com> Date: Tue, 27 Jun 2023 06:51:58 -0400 Subject: [PATCH 8/8] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f4cbbcad1..51d86b5fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,7 +74,7 @@ experimentalist-falsification =[ "autora-experimentalist-falsification" ] experimentalist-sampler-mixture =[ - "mixture-experimentalist==1.0.0a3" + "mixture-experimentalist==1.0.0a4" ] all-experiment-runners = [