| Previous changeset 48:279cdd8d39e2 (2026-03-12) Next changeset 50:dea38330b78a (2026-04-22) |
|
Commit message:
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/sklearn commit 315f8d8ceb046add190163991f361a3bf63e57f5 |
|
modified:
discriminant.xml main_macros.xml |
|
removed:
pdb70_cs219.ffdata |
| b |
| diff -r 279cdd8d39e2 -r 4ee087eeda62 discriminant.xml --- a/discriminant.xml Thu Mar 12 14:34:33 2026 +0000 +++ b/discriminant.xml Thu Mar 26 20:09:44 2026 +0000 |
| b |
| @@ -92,52 +92,92 @@ </inputs> <expand macro="output" /> <tests> - <test> - <param name="infile1" value="train.tabular" ftype="tabular" /> - <param name="infile2" value="train.tabular" ftype="tabular" /> - <param name="col1" value="1,2,3,4" /> - <param name="col2" value="5" /> - <param name="selected_task" value="train" /> - <param name="selected_algorithm" value="LinearDiscriminantAnalysis" /> - <param name="solver" value="svd" /> - <param name="store_covariance" value="True" /> + <test expect_num_outputs="1"> + <conditional name="selected_tasks"> + <param name="selected_task" value="train" /> + <conditional name="selected_algorithms"> + <param name="selected_algorithm" value="LinearDiscriminantAnalysis" /> + <conditional name="input_options"> + <param name="infile1" value="train.tabular" ftype="tabular" /> + <param name="infile2" value="train.tabular" ftype="tabular" /> + <conditional name="column_selector_options_1"> + <param name="col1" value="1,2,3,4" /> + </conditional> + <conditional name="column_selector_options_2"> + <param name="col2" value="5" /> + </conditional> + </conditional> + <section name="options"> + <param name="solver" value="svd" /> + <param name="store_covariance" value="True" /> + </section> + </conditional> + </conditional> <output name="outfile_fit" file="lda_model01" compare="sim_size" delta="1" /> </test> - <test> - <param name="infile1" value="train.tabular" ftype="tabular" /> - <param name="infile2" value="train.tabular" ftype="tabular" /> - <param name="col1" value="1,2,3,4" /> - <param name="col2" value="5" /> - <param name="selected_task" value="train" /> - <param name="selected_algorithm" value="LinearDiscriminantAnalysis" /> - <param name="solver" value="lsqr" /> + <test expect_num_outputs="1"> + <conditional name="selected_tasks"> + <param name="selected_task" value="train" /> + <conditional name="selected_algorithms"> + <param name="selected_algorithm" value="LinearDiscriminantAnalysis" /> + <conditional name="input_options"> + <param name="infile1" value="train.tabular" ftype="tabular" /> + <param name="infile2" value="train.tabular" ftype="tabular" /> + <conditional name="column_selector_options_1"> + <param name="col1" value="1,2,3,4" /> + </conditional> + <conditional name="column_selector_options_2"> + <param name="col2" value="5" /> + </conditional> + </conditional> + <section name="options"> + <param name="solver" value="lsqr" /> + </section> + </conditional> + </conditional> <output name="outfile_fit" file="lda_model02" compare="sim_size" delta="1" /> </test> - <test> - <param name="infile1" value="train.tabular" ftype="tabular" /> - <param name="infile2" value="train.tabular" ftype="tabular" /> - <param name="col1" value="1,2,3,4" /> - <param name="col2" value="5" /> - <param name="selected_task" value="train" /> - <param name="selected_algorithm" value="QuadraticDiscriminantAnalysis" /> + <test expect_num_outputs="1"> + <conditional name="selected_tasks"> + <param name="selected_task" value="train" /> + <conditional name="selected_algorithms"> + <param name="selected_algorithm" value="QuadraticDiscriminantAnalysis" /> + <conditional name="input_options"> + <param name="infile1" value="train.tabular" ftype="tabular" /> + <param name="infile2" value="train.tabular" ftype="tabular" /> + <conditional name="column_selector_options_1"> + <param name="col1" value="1,2,3,4" /> + </conditional> + <conditional name="column_selector_options_2"> + <param name="col2" value="5" /> + </conditional> + </conditional> + </conditional> + </conditional> <output name="outfile_fit" file="qda_model01" compare="sim_size" delta="1" /> </test> - <test> - <param name="infile_model" value="lda_model01" ftype="h5mlm" /> - <param name="infile_data" value="test.tabular" ftype="tabular" /> - <param name="selected_task" value="load" /> + <test expect_num_outputs="1"> + <conditional name="selected_tasks"> + <param name="selected_task" value="load" /> + <param name="infile_model" value="lda_model01" ftype="h5mlm" /> + <param name="infile_data" value="test.tabular" ftype="tabular" /> + </conditional> <output name="outfile_predict" file="lda_prediction_result01.tabular" /> </test> - <test> - <param name="infile_model" value="lda_model02" ftype="h5mlm" /> - <param name="infile_data" value="test.tabular" ftype="tabular" /> - <param name="selected_task" value="load" /> + <test expect_num_outputs="1"> + <conditional name="selected_tasks"> + <param name="selected_task" value="load" /> + <param name="infile_model" value="lda_model02" ftype="h5mlm" /> + <param name="infile_data" value="test.tabular" ftype="tabular" /> + </conditional> <output name="outfile_predict" file="lda_prediction_result02.tabular" /> </test> - <test> - <param name="infile_model" value="qda_model01" ftype="h5mlm" /> - <param name="infile_data" value="test.tabular" ftype="tabular" /> - <param name="selected_task" value="load" /> + <test expect_num_outputs="1"> + <conditional name="selected_tasks"> + <param name="selected_task" value="load" /> + <param name="infile_model" value="qda_model01" ftype="h5mlm" /> + <param name="infile_data" value="test.tabular" ftype="tabular" /> + </conditional> <output name="outfile_predict" file="qda_prediction_result01.tabular" /> </test> </tests> |
| b |
| diff -r 279cdd8d39e2 -r 4ee087eeda62 main_macros.xml --- a/main_macros.xml Thu Mar 12 14:34:33 2026 +0000 +++ b/main_macros.xml Thu Mar 26 20:09:44 2026 +0000 |
| b |
| @@ -1,6 +1,6 @@ <macros> - <token name="@VERSION@">1.0.11.0</token> - <token name="@PROFILE@">21.05</token> + <token name="@VERSION@">1.0.11.1</token> + <token name="@PROFILE@">24.2</token> <xml name="python_requirements"> <requirements> @@ -1427,7 +1427,7 @@ <options from_dataset="infile_estimator" meta_file_key="hyper_params" startswith="@"> <column name="name" index="2" /> <column name="value" index="1" /> - <filter type="unique_value" name="unique_param" column="1" /> + <filter type="unique_value" column="1" /> </options> </param> <param name="sp_value" type="text" value="" optional="true" label="New value" help="Supports int, float, boolean, single quoted string, and selected object constructor. Similar to the `Parameter settings for search` section in `searchcv` tool except that only single value is expected here."> |
| b |
| diff -r 279cdd8d39e2 -r 4ee087eeda62 pdb70_cs219.ffdata --- a/pdb70_cs219.ffdata Thu Mar 12 14:34:33 2026 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| [ |
| @@ -1,189 +0,0 @@ - - - - -<!DOCTYPE HTML> -<html> - <!--base.mako--> - - - - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <meta name = "viewport" content = "maximum-scale=1.0"> - <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> - - <title> - Galaxy - | Europe - | - </title> - - <link rel="index" href="/"/> - - - - <link href="/static/style/bootstrap-tour.css?v=1618364054" media="screen" rel="stylesheet" type="text/css" /> - <link href="/static/dist/base.css?v=1618364054" media="screen" rel="stylesheet" type="text/css" /> - - - <script src="/static/dist/libs.chunk.js?v=1618364054" type="text/javascript"></script> -<script src="/static/dist/base.chunk.js?v=1618364054" type="text/javascript"></script> -<script src="/static/dist/generic.bundled.js?v=1618364054" type="text/javascript"></script> - - - <!-- message.mako javascript_app() --> - - - - <script type="text/javascript"> - // galaxy_client_app.mako, load - - var bootstrapped; - try { - bootstrapped = -{} -; - } catch(err) { - console.warn("Unable to parse bootstrapped variable", err); - bootstrapped = {}; - } - - var options = { - root: '/', - config: - -{ -"display_galaxy_brand": true, -"chunk_upload_size": 104857600, -"use_remote_user": null, -"enable_oidc": true, -"mailing_join_addr": null, -"select_type_workflow_threshold": -1, -"myexperiment_target_url": "www.myexperiment.org:80", -"tool_recommendation_model_path": "https://github.com/galaxyproject/galaxy-test-data/raw/master/tool_recommendation_model.hdf5", -"simplified_workflow_run_ui_target_history": "current", -"interactivetools_enable": true, -"is_admin_user": false, -"show_welcome_with_login": true, -"welcome_url": "/static/welcome.html", -"allow_user_impersonation": true, -"overwrite_model_recommendations": false, -"topk_recommendations": 10, -"user_library_import_dir_available": false, -"ga_code": null, -"enable_beta_markdown_export": true, -"visualizations_visible": true, -"enable_tool_recommendations": true, -"enable_unique_workflow_defaults": false, -"registration_warning_message": "Please register only one account. The usegalaxy.eu service is provided free of charge and has limited computational and data storage resources. <strong>Registration and usage of multiple accounts is tracked and such accounts are subject to termination and data deletion.<\/strong>", -"logo_src": "/static/favicon.png", -"enable_quotas": true, -"server_mail_configured": true, -"citation_url": "https://galaxyproject.org/citing-galaxy", -"allow_user_dataset_purge": true, -"ftp_upload_site": "ftp://ftp.usegalaxy.eu", -"terms_url": "https://usegalaxy.eu/terms", -"upload_from_form_button": "always-on", -"wiki_url": "https://galaxyproject.org/", -"logo_src_secondary": null, -"aws_estimate": true, -"single_user": false, -"datatypes_disable_auto": false, -"brand": "Europe", -"mailing_lists": "https://galaxyproject.org/mailing-lists/", -"python": [ -3, -6 -], -"release_doc_base_url": "https://docs.galaxyproject.org/en/release_", -"enable_openid": false, -"cookie_domain": null, -"message_box_content": "You are using the new UseGalaxy.eu backend server, let us know if you encounter any issues!", -"admin_tool_recommendations_path": "/opt/galaxy/config/tool_recommendations_overwrite.yml", -"search_url": "https://galaxyproject.org/search/", -"remote_user_logout_href": null, -"default_locale": "auto", -"screencasts_url": "https://vimeo.com/galaxyproject", -"quota_url": "https://galaxyproject.org/support/account-quotas/", -"version_major": "21.01", -"simplified_workflow_run_ui": "prefer", -"allow_user_creation": true, -"lims_doc_url": "https://usegalaxy.org/u/rkchak/p/sts", -"message_box_visible": false, -"has_user_tool_filters": true, -"message_box_class": "info", -"require_login": false, -"logo_url": "/", -"support_url": "https://galaxyproject.org/support/", -"simplified_workflow_run_ui_job_cache": "off", -"server_startttime": 1618364054, -"oidc": { -"elixir": { -"icon": "https://elixir-europe.org/sites/default/files/images/login-button-orange.png" -} -}, -"version_minor": "", -"helpsite_url": "https://help.galaxyproject.org/c/usegalaxy-eu-support", -"file_sources_configured": true, -"inactivity_box_content": "Your account has not been activated yet. Feel free to browse around and see what's available, but you won't be able to upload data or run jobs until you have verified your email address.", -"nginx_upload_path": "/_upload" -} -, - user: - -{ -"total_disk_usage": 0, -"nice_total_disk_usage": "0 bytes", -"quota_percent": null -} -, - session_csrf_token: 'c3ae71f65be7de55dd5bd5f97f316000' - }; - - config.set({ - options: options, - bootstrapped: bootstrapped - }); - - - </script> - - - - - - - - - - <script type="text/javascript"> - config.addInitialization(function() { - if (parent.handle_minwidth_hint) { - parent.handle_minwidth_hint(-1); - } - }); - </script> - - </head> - <body class="inbound"> - - - - <div class="message mt-2 alert alert-danger">You are not allowed to access this dataset</div> - - - </body> -</html> - - - - - - - - - - - - |