Merge remote-tracking branch 'origin/main' into 215-select-columns-wh…

…en-importing-metadata
cschlaffner · Nov 17, 2023 · fae37c1 · fae37c1
2 parents ddb8d04 + 74ce2cf
commit fae37c1
Show file tree

Hide file tree

Showing 7 changed files with 317 additions and 84 deletions.
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
@@ -3,7 +3,7 @@ name: Issue Template
 about: Standard Issue Template
 title: 
 labels: 
-project: PROTzilla 2
+project: "PROTzilla"
 
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/todo_issue.md b/.github/ISSUE_TEMPLATE/todo_issue.md
@@ -3,7 +3,7 @@ name: TODO
 about: TODO Issue Template
 title: '# TODO <issue_nr>'
 labels: todo
-project: 'PROTzilla2'
+project: 'PROTzilla'
 
 ---
 

diff --git a/protzilla/constants/location_mapping.py b/protzilla/constants/location_mapping.py
@@ -132,6 +132,11 @@
         "imputation",
         "min_value_per_dataset",
     ): imputation.by_min_per_dataset,
+    (
+        "data_preprocessing",
+        "imputation",
+        "normal_distribution_sampling",
+    ): imputation.by_normal_distribution_sampling,
     (
         "data_preprocessing",
         "filter_peptides",
@@ -318,6 +323,11 @@
         "imputation",
         "min_value_per_dataset",
     ): imputation.by_min_per_dataset_plot,
+    (
+        "data_preprocessing",
+        "imputation",
+        "normal_distribution_sampling",
+    ): imputation.by_normal_distribution_sampling_plot,
     (
         "data_preprocessing",
         "outlier_detection",

diff --git a/protzilla/constants/workflow_meta.json b/protzilla/constants/workflow_meta.json
@@ -703,6 +703,69 @@
             }
           }
         ]
+      },
+      "normal_distribution_sampling": {
+        "name": "Normal Distribution Sampling",
+        "description": "Imputation methods include normal distribution sampling per Protein or over Dataset",
+        "parameters": {
+          "strategy": {
+            "name": "Strategy:",
+            "type": "categorical",
+            "categories": [
+              "perProtein",
+              "perDataset"
+            ],
+            "default": "perProtein"
+          },
+          "down_shift": {
+            "name": "Downshift:",
+            "type": "numeric",
+            "min": -10,
+            "max": 10,
+            "default": -1
+          },
+           "scaling_factor": {
+            "name": "Scaling Factor:",
+            "type": "numeric",
+            "min": 0,
+            "max": 1,
+            "default": 1
+          }
+        },
+        "graphs": [
+          {
+            "graph_type": {
+              "name": "Graph type:",
+              "type": "categorical",
+              "categories": [
+                "Boxplot",
+                "Histogram"
+              ],
+              "default": "Boxplot"
+            },
+            "group_by": {
+              "name": "Group by:",
+              "type": "categorical",
+              "categories": [
+                "None",
+                "Sample",
+                "Protein ID"
+              ],
+              "default": "None"
+            }
+          },
+          {
+            "graph_type_quantities": {
+              "name": "Graph type Imputed Values:",
+              "type": "categorical",
+              "categories": [
+                "Bar chart",
+                "Pie chart"
+              ],
+              "default": "Pie chart"
+            }
+          }
+        ]
       }
     },
     "filter_peptides": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Issue Template @@
     about: Standard Issue Template
     title:
     labels:
-    project: PROTzilla 2
+    project: "PROTzilla"
     ---
@@ Expand Down @@