Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating doe_synbio from version 2.1.2 to 2.2.0 #169

Merged
merged 4 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions tools/doe_synbio/optdoe.xml
Original file line number Diff line number Diff line change
Expand Up @@ -187,23 +187,23 @@ Above are examples of two constructs generated through optimal combinatorial des
Note: if advanced parameter "input_parts" is left empty, the following parts are used:


+---------+------------+--------------------------------------------------+
| Name | Type | SynBioHub |
+=========+============+==================================================+
| PlacUV5 | Promoter | https://synbiohub.org/public/igem/BBa_K1847014/1 |
+---------+------------+--------------------------------------------------+
| Ptrc | Promoter | https://synbiohub.org/public/igem/BBa_J56012/1 |
+---------+------------+--------------------------------------------------+
| BBR1 | Origin | https://synbiohub.org/public/igem/BBa_I50041/1 |
+---------+------------+--------------------------------------------------+
| p15A | Origin | https://synbiohub.org/public/igem/BBa_I50032/1 |
+---------+------------+--------------------------------------------------+
| ColE1 | Origin | https://synbiohub.org/public/igem/BBa_J64101/1 |
+---------+------------+--------------------------------------------------+
| res1 | Resistance | https://synbiohub.org/public/igem/BBa_I13800/1 |
+---------+------------+--------------------------------------------------+
| Ter | Terminator | https://synbiohub.org/public/igem/BBa_B1006/1 |
+---------+------------+--------------------------------------------------+
+---------+------------+--------------+
| Name | Type | SynBioHub |
+=========+============+==============+
| PlacUV5 | Promoter | BBa_K1847014 |
+---------+------------+--------------+
| Ptrc | Promoter | BBa_J56012 |
+---------+------------+--------------+
| BBR1 | Origin | BBa_I50041 |
+---------+------------+--------------+
| p15A | Origin | BBa_I50032 |
+---------+------------+--------------+
| ColE1 | Origin | BBa_J64101 |
+---------+------------+--------------+
| res1 | Resistance | BBa_I13800 |
+---------+------------+--------------+
| Ter | Terminator | BBa_B1006 |
+---------+------------+--------------+

The source of this file can be found here as a model: https://raw.githubusercontent.com/pablocarb/doebase/master/doebase/data/ref_parts.csv

Expand Down
11 changes: 5 additions & 6 deletions tools/doe_synbio/sampler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<description>Generate data points using latin hypercube sampling (LHS)</description>
<macros>
<import>macros.xml</import>
<token name="@TOOL_VERSION@">2.1.2</token>
<token name="@TOOL_VERSION@">2.2.0</token>
</macros>
<requirements>
<requirement type="package" version="@TOOL_VERSION@">icfree</requirement>
Expand Down Expand Up @@ -53,21 +53,20 @@
<tests>
<!-- test 1: check if identical outputs are produced with default parameters -->
<test>
<param name="cfps_file" value="converter_proCFPS_parameters.tsv" />
<param name="cfps_file" value="sampler/input/parameters.tsv" />
<param name="seed_param" value="not_random" />
<param name="seed" value="0" />
<output name="output_sampling" file="sampler_sampling.test-1.tsv" ftype="tabular" compare="diff" />
<output name="output_sampling" file="sampler/output/sampling.test-1.tsv" ftype="tabular" compare="diff" />
</test>
<!-- test 2: advanced arguments -->
<test>
<param name="cfps_file" value="converter_proCFPS_parameters.tsv" />
<param name="cfps_file" value="sampler/input/parameters.tsv" />
<param name="nb_sampling_steps" value="3" />
<param name="nb_samples" value="100" />
<param name="sampling_ratio" value="0.4 0.2 0.3" />
<param name="seed_param" value="not_random" />
<param name="seed" value="0" />
<param name="nb_samples" value="100" />
<output name="output_sampling" file="sampler_sampling.test-2.tsv" ftype="tabular" compare="diff" />
<output name="output_sampling" file="sampler/output/sampling.test-2.tsv" ftype="tabular" compare="diff" />
</test>
</tests>
<help><![CDATA[
Expand Down
17 changes: 0 additions & 17 deletions tools/doe_synbio/test-data/converter_proCFPS_parameters.tsv

This file was deleted.

9 changes: 9 additions & 0 deletions tools/doe_synbio/test-data/sampler/input/parameters.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Component maxValue Ratios
Component_1 125 0.0 0.1 0.3 0.5 1.0
Component_2 125 1
Component_3 125
Component_4 125
Component_5 125
Component_6 125
Component_7 125
Component_8 125
100 changes: 100 additions & 0 deletions tools/doe_synbio/test-data/sampler/output/sampling.test-1.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
Component_1 Component_2 Component_3 Component_4 Component_5 Component_6 Component_7 Component_8
0.0 125.0 125.0 0.0 31.25 93.75 62.5 93.75
37.5 125.0 31.25 93.75 125.0 62.5 125.0 125.0
37.5 125.0 0.0 93.75 31.25 31.25 31.25 0.0
37.5 125.0 31.25 62.5 125.0 125.0 93.75 93.75
12.5 125.0 31.25 31.25 93.75 125.0 31.25 31.25
125.0 125.0 31.25 93.75 125.0 0.0 125.0 93.75
0.0 125.0 93.75 0.0 93.75 125.0 31.25 125.0
125.0 125.0 125.0 31.25 0.0 0.0 125.0 31.25
37.5 125.0 125.0 125.0 125.0 93.75 62.5 0.0
125.0 125.0 62.5 62.5 62.5 62.5 0.0 0.0
62.5 125.0 93.75 0.0 93.75 62.5 62.5 62.5
37.5 125.0 93.75 62.5 93.75 0.0 93.75 0.0
125.0 125.0 62.5 62.5 93.75 93.75 93.75 125.0
37.5 125.0 0.0 93.75 125.0 125.0 62.5 0.0
0.0 125.0 31.25 0.0 0.0 0.0 93.75 0.0
37.5 125.0 62.5 31.25 0.0 93.75 93.75 62.5
12.5 125.0 31.25 62.5 125.0 125.0 125.0 62.5
12.5 125.0 62.5 62.5 31.25 125.0 125.0 125.0
125.0 125.0 0.0 125.0 31.25 62.5 93.75 31.25
12.5 125.0 31.25 0.0 62.5 93.75 125.0 93.75
62.5 125.0 0.0 125.0 0.0 31.25 125.0 31.25
12.5 125.0 0.0 93.75 62.5 93.75 0.0 93.75
0.0 125.0 62.5 125.0 62.5 125.0 0.0 125.0
62.5 125.0 31.25 125.0 62.5 31.25 0.0 93.75
37.5 125.0 0.0 62.5 0.0 62.5 62.5 31.25
62.5 125.0 0.0 0.0 93.75 31.25 62.5 0.0
12.5 125.0 0.0 93.75 0.0 62.5 31.25 31.25
0.0 125.0 62.5 0.0 31.25 62.5 31.25 31.25
125.0 125.0 0.0 125.0 125.0 31.25 62.5 62.5
0.0 125.0 31.25 31.25 125.0 31.25 125.0 31.25
12.5 125.0 31.25 0.0 125.0 0.0 62.5 93.75
125.0 125.0 62.5 31.25 62.5 93.75 0.0 62.5
37.5 125.0 125.0 62.5 0.0 0.0 125.0 0.0
125.0 125.0 93.75 31.25 93.75 125.0 0.0 0.0
0.0 125.0 62.5 31.25 0.0 62.5 93.75 62.5
37.5 125.0 125.0 93.75 93.75 62.5 62.5 93.75
12.5 125.0 31.25 62.5 0.0 0.0 0.0 93.75
125.0 125.0 31.25 125.0 93.75 0.0 31.25 0.0
62.5 125.0 93.75 0.0 62.5 125.0 31.25 125.0
12.5 125.0 0.0 62.5 31.25 31.25 31.25 93.75
62.5 125.0 93.75 31.25 125.0 125.0 62.5 125.0
0.0 125.0 62.5 93.75 125.0 93.75 62.5 31.25
37.5 125.0 93.75 93.75 62.5 31.25 0.0 0.0
37.5 125.0 93.75 125.0 0.0 0.0 93.75 0.0
0.0 125.0 62.5 0.0 31.25 93.75 93.75 0.0
125.0 125.0 125.0 31.25 31.25 125.0 31.25 93.75
62.5 125.0 125.0 93.75 31.25 31.25 0.0 125.0
0.0 125.0 62.5 125.0 93.75 93.75 0.0 31.25
37.5 125.0 31.25 31.25 0.0 62.5 62.5 0.0
12.5 125.0 0.0 0.0 31.25 93.75 62.5 125.0
62.5 125.0 0.0 125.0 125.0 93.75 93.75 0.0
0.0 125.0 93.75 93.75 31.25 125.0 0.0 62.5
125.0 125.0 0.0 0.0 93.75 31.25 31.25 62.5
37.5 125.0 125.0 31.25 93.75 0.0 93.75 93.75
62.5 125.0 31.25 0.0 93.75 31.25 125.0 0.0
0.0 125.0 62.5 62.5 62.5 31.25 31.25 93.75
37.5 125.0 125.0 62.5 62.5 0.0 93.75 62.5
62.5 125.0 62.5 125.0 62.5 125.0 31.25 62.5
125.0 125.0 0.0 31.25 125.0 93.75 93.75 31.25
37.5 125.0 62.5 125.0 62.5 62.5 31.25 62.5
12.5 125.0 0.0 31.25 0.0 62.5 62.5 125.0
12.5 125.0 93.75 93.75 31.25 125.0 125.0 125.0
12.5 125.0 93.75 93.75 31.25 31.25 31.25 93.75
62.5 125.0 0.0 31.25 31.25 31.25 125.0 62.5
37.5 125.0 31.25 93.75 125.0 62.5 0.0 62.5
0.0 125.0 125.0 125.0 0.0 62.5 125.0 125.0
62.5 125.0 31.25 125.0 0.0 31.25 93.75 31.25
125.0 125.0 93.75 125.0 125.0 125.0 31.25 62.5
12.5 125.0 62.5 31.25 62.5 93.75 125.0 31.25
12.5 125.0 0.0 125.0 93.75 0.0 31.25 31.25
12.5 125.0 93.75 125.0 125.0 62.5 93.75 31.25
0.0 125.0 93.75 93.75 62.5 31.25 0.0 125.0
62.5 125.0 125.0 0.0 93.75 0.0 125.0 93.75
0.0 125.0 0.0 0.0 31.25 62.5 0.0 62.5
62.5 125.0 62.5 31.25 31.25 62.5 31.25 125.0
62.5 125.0 125.0 93.75 31.25 0.0 0.0 93.75
125.0 125.0 62.5 0.0 125.0 125.0 93.75 62.5
125.0 125.0 31.25 125.0 0.0 31.25 93.75 62.5
0.0 125.0 125.0 62.5 93.75 0.0 0.0 31.25
125.0 125.0 125.0 31.25 62.5 0.0 0.0 62.5
0.0 125.0 0.0 31.25 93.75 31.25 62.5 31.25
125.0 125.0 93.75 93.75 93.75 93.75 62.5 125.0
0.0 125.0 125.0 31.25 62.5 0.0 62.5 125.0
12.5 125.0 93.75 62.5 0.0 125.0 93.75 93.75
12.5 125.0 125.0 0.0 125.0 62.5 0.0 62.5
37.5 125.0 31.25 93.75 0.0 125.0 0.0 125.0
0.0 125.0 93.75 0.0 62.5 125.0 31.25 125.0
62.5 125.0 125.0 93.75 125.0 31.25 125.0 0.0
125.0 125.0 93.75 62.5 62.5 0.0 125.0 125.0
62.5 125.0 93.75 62.5 31.25 93.75 31.25 125.0
37.5 125.0 31.25 0.0 93.75 93.75 125.0 93.75
0.0 125.0 0.0 125.0 31.25 93.75 125.0 31.25
62.5 125.0 125.0 31.25 62.5 62.5 62.5 0.0
62.5 125.0 62.5 93.75 93.75 31.25 93.75 0.0
62.5 125.0 93.75 62.5 31.25 0.0 125.0 93.75
12.5 125.0 31.25 0.0 0.0 0.0 93.75 93.75
12.5 125.0 125.0 62.5 125.0 93.75 62.5 31.25
125.0 125.0 125.0 125.0 0.0 93.75 31.25 31.25
125.0 125.0 62.5 62.5 0.0 125.0 0.0 0.0
101 changes: 101 additions & 0 deletions tools/doe_synbio/test-data/sampler/output/sampling.test-2.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
Component_1 Component_2 Component_3 Component_4 Component_5 Component_6 Component_7 Component_8
62.5 125.0 25.0 50.0 50.0 25.0 25.0 37.5
0.0 125.0 25.0 37.5 25.0 50.0 37.5 25.0
125.0 125.0 25.0 25.0 37.5 25.0 50.0 50.0
12.5 125.0 25.0 25.0 50.0 37.5 37.5 25.0
37.5 125.0 25.0 25.0 37.5 37.5 50.0 37.5
62.5 125.0 25.0 37.5 25.0 25.0 37.5 25.0
37.5 125.0 50.0 25.0 50.0 50.0 37.5 25.0
62.5 125.0 37.5 50.0 37.5 50.0 37.5 37.5
125.0 125.0 37.5 50.0 25.0 50.0 25.0 50.0
37.5 125.0 50.0 37.5 50.0 50.0 25.0 37.5
62.5 125.0 50.0 37.5 25.0 25.0 25.0 25.0
12.5 125.0 25.0 37.5 37.5 37.5 37.5 37.5
0.0 125.0 25.0 50.0 37.5 37.5 37.5 37.5
0.0 125.0 37.5 25.0 50.0 50.0 50.0 37.5
62.5 125.0 50.0 25.0 37.5 50.0 50.0 25.0
37.5 125.0 25.0 50.0 37.5 50.0 37.5 25.0
125.0 125.0 37.5 50.0 50.0 50.0 25.0 25.0
62.5 125.0 37.5 50.0 37.5 37.5 25.0 37.5
12.5 125.0 25.0 50.0 25.0 50.0 50.0 25.0
125.0 125.0 25.0 37.5 50.0 50.0 25.0 50.0
62.5 125.0 25.0 25.0 37.5 25.0 37.5 50.0
62.5 125.0 50.0 25.0 37.5 25.0 50.0 50.0
12.5 125.0 25.0 50.0 37.5 25.0 25.0 50.0
12.5 125.0 37.5 25.0 25.0 50.0 50.0 25.0
125.0 125.0 25.0 25.0 37.5 25.0 37.5 37.5
0.0 125.0 50.0 37.5 37.5 37.5 25.0 37.5
62.5 125.0 50.0 37.5 37.5 50.0 25.0 37.5
125.0 125.0 50.0 25.0 50.0 37.5 50.0 50.0
125.0 125.0 37.5 25.0 25.0 25.0 37.5 25.0
12.5 125.0 50.0 50.0 50.0 25.0 37.5 50.0
125.0 125.0 25.0 37.5 25.0 25.0 50.0 50.0
62.5 125.0 37.5 37.5 25.0 50.0 37.5 37.5
62.5 125.0 50.0 50.0 37.5 37.5 25.0 25.0
0.0 125.0 37.5 37.5 25.0 25.0 50.0 50.0
0.0 125.0 50.0 37.5 37.5 37.5 37.5 50.0
37.5 125.0 25.0 37.5 50.0 37.5 37.5 37.5
37.5 125.0 25.0 25.0 37.5 50.0 50.0 50.0
62.5 125.0 37.5 37.5 50.0 50.0 50.0 37.5
125.0 125.0 37.5 25.0 50.0 37.5 50.0 50.0
37.5 125.0 50.0 50.0 50.0 37.5 25.0 25.0
12.5 125.0 37.5 50.0 25.0 37.5 50.0 25.0
0.0 125.0 25.0 50.0 25.0 25.0 37.5 50.0
62.5 125.0 50.0 50.0 50.0 37.5 50.0 37.5
12.5 125.0 25.0 37.5 50.0 50.0 25.0 37.5
12.5 125.0 50.0 25.0 37.5 25.0 37.5 50.0
37.5 125.0 25.0 25.0 37.5 50.0 37.5 50.0
0.0 125.0 25.0 37.5 25.0 37.5 25.0 25.0
62.5 125.0 50.0 25.0 37.5 37.5 25.0 25.0
12.5 125.0 50.0 50.0 50.0 37.5 37.5 25.0
37.5 125.0 37.5 37.5 37.5 37.5 25.0 37.5
37.5 125.0 50.0 25.0 37.5 25.0 25.0 25.0
37.5 125.0 37.5 37.5 25.0 50.0 25.0 37.5
62.5 125.0 25.0 37.5 37.5 37.5 50.0 25.0
125.0 125.0 25.0 25.0 25.0 25.0 50.0 37.5
37.5 125.0 37.5 50.0 50.0 25.0 50.0 25.0
125.0 125.0 37.5 25.0 25.0 37.5 50.0 25.0
37.5 125.0 50.0 50.0 37.5 50.0 37.5 37.5
12.5 125.0 25.0 25.0 37.5 25.0 37.5 25.0
37.5 125.0 37.5 50.0 37.5 37.5 25.0 50.0
125.0 125.0 37.5 25.0 50.0 25.0 37.5 50.0
0.0 125.0 25.0 25.0 50.0 25.0 25.0 37.5
125.0 125.0 50.0 50.0 50.0 37.5 37.5 50.0
37.5 125.0 25.0 37.5 37.5 25.0 50.0 50.0
12.5 125.0 50.0 25.0 37.5 37.5 37.5 50.0
0.0 125.0 50.0 50.0 50.0 25.0 50.0 25.0
125.0 125.0 37.5 37.5 50.0 50.0 25.0 50.0
0.0 125.0 37.5 50.0 25.0 25.0 50.0 37.5
0.0 125.0 25.0 50.0 25.0 25.0 25.0 50.0
62.5 125.0 37.5 25.0 50.0 37.5 50.0 37.5
0.0 125.0 50.0 25.0 25.0 25.0 50.0 50.0
37.5 125.0 50.0 50.0 25.0 50.0 50.0 50.0
12.5 125.0 37.5 50.0 25.0 50.0 25.0 37.5
12.5 125.0 50.0 37.5 37.5 37.5 50.0 37.5
37.5 125.0 50.0 37.5 50.0 37.5 37.5 50.0
0.0 125.0 50.0 50.0 50.0 50.0 37.5 25.0
37.5 125.0 50.0 25.0 50.0 25.0 25.0 25.0
37.5 125.0 50.0 37.5 50.0 37.5 37.5 25.0
12.5 125.0 25.0 25.0 50.0 37.5 25.0 50.0
12.5 125.0 25.0 25.0 25.0 50.0 50.0 25.0
12.5 125.0 50.0 25.0 37.5 25.0 50.0 25.0
0.0 125.0 37.5 50.0 25.0 37.5 37.5 37.5
62.5 125.0 37.5 37.5 50.0 25.0 25.0 37.5
0.0 125.0 37.5 37.5 25.0 50.0 37.5 37.5
125.0 125.0 25.0 25.0 37.5 50.0 25.0 25.0
62.5 125.0 50.0 50.0 50.0 37.5 25.0 50.0
62.5 125.0 25.0 37.5 25.0 25.0 25.0 37.5
12.5 125.0 50.0 25.0 25.0 50.0 50.0 25.0
62.5 125.0 25.0 37.5 37.5 25.0 50.0 25.0
0.0 125.0 37.5 50.0 25.0 25.0 25.0 50.0
125.0 125.0 50.0 37.5 25.0 25.0 37.5 25.0
0.0 125.0 37.5 37.5 25.0 50.0 50.0 37.5
125.0 125.0 37.5 37.5 25.0 37.5 50.0 50.0
0.0 125.0 50.0 50.0 50.0 25.0 50.0 50.0
12.5 125.0 37.5 25.0 50.0 50.0 25.0 25.0
125.0 125.0 25.0 37.5 37.5 37.5 37.5 37.5
12.5 125.0 37.5 50.0 50.0 50.0 25.0 37.5
37.5 125.0 37.5 37.5 25.0 37.5 25.0 50.0
0.0 125.0 25.0 50.0 25.0 50.0 37.5 37.5
125.0 125.0 25.0 50.0 25.0 25.0 37.5 50.0
0.0 125.0 50.0 50.0 37.5 25.0 37.5 37.5
Loading