From 8a6f213e60699bf27eca70d8ed259e14715c96fc Mon Sep 17 00:00:00 2001
From: Fritz Zaucker <fritz.zaucker@oetiker.ch>
Date: Wed, 15 Jun 2022 13:57:19 +0200
Subject: [PATCH 01/12] Add TotalNH3 print filter

---
 share/Models/version6/Total.nhd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/Models/version6/Total.nhd b/share/Models/version6/Total.nhd
index 804d63e8..236b77c7 100644
--- a/share/Models/version6/Total.nhd
+++ b/share/Models/version6/Total.nhd
@@ -25,7 +25,7 @@ taxonomy = Total
 
 +nh3_nanimalproduction
   format= %.0f
-  print = SummaryLivestock,ResultsLivestock,LivestockNH3
+  print = SummaryLivestock,ResultsLivestock,LivestockNH3,TotalNH3
   ++labels
     sort = 099
     en = Total

From f5bae0023e4a4ee6069c60f6b496b6a04b48dbb9 Mon Sep 17 00:00:00 2001
From: Fritz Zaucker <fritz.zaucker@oetiker.ch>
Date: Wed, 15 Jun 2022 13:58:33 +0200
Subject: [PATCH 02/12] Add comments

---
 lib/Agrammon/OutputFormatter/Text.pm6 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Agrammon/OutputFormatter/Text.pm6 b/lib/Agrammon/OutputFormatter/Text.pm6
index 5bef73e0..472b5885 100644
--- a/lib/Agrammon/OutputFormatter/Text.pm6
+++ b/lib/Agrammon/OutputFormatter/Text.pm6
@@ -77,9 +77,12 @@ sub add-filters(@module-lines, Agrammon::Outputs::FilterGroupCollection $collect
         $unit, Str $prefix, Bool :$all-filters) {
     my @results = $collection.results-by-filter-group(:all($all-filters));
     my $longest-filter = @results.map({ .key.map({ .key.chars + .value.chars }) }).flat.max + 1;
+    warn "TEXT formatter might have to be extended for multiple filter groups" if @filters.elems > 1;
     for @results {
         my %filters := .key;
         my $value := .value;
+#        TODO: make this an option
+#        next unless $value;
         my @filters = %filters.map: { .key ~ '=' ~ .value };
         for (@filters || '(Uncategorized)').kv -> $idx, $filter-id {
             my $padding = ' ' x $longest-filter - $filter-id.chars;

From fd27ff824d197c5c343f8a60a2b1f6d44157ab3e Mon Sep 17 00:00:00 2001
From: Fritz Zaucker <fritz.zaucker@oetiker.ch>
Date: Wed, 15 Jun 2022 14:00:33 +0200
Subject: [PATCH 03/12] Add merged filter output to JSON

---
 lib/Agrammon/OutputFormatter/JSON.pm6 | 50 ++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/lib/Agrammon/OutputFormatter/JSON.pm6 b/lib/Agrammon/OutputFormatter/JSON.pm6
index a300b9e6..2ff4ccee 100644
--- a/lib/Agrammon/OutputFormatter/JSON.pm6
+++ b/lib/Agrammon/OutputFormatter/JSON.pm6
@@ -13,7 +13,7 @@ sub output-as-json(
     Bool :$all-filters = False,
     Bool :$short = False
 ) is export {
-    return get-data($model, $outputs, $include-filters, @print-set, $short, $language);
+    return get-data($model, $outputs, $include-filters, @print-set, $short, $language, :merge-filters);
 }
 
 sub output-for-gui(Agrammon::Model $model,
@@ -28,7 +28,7 @@ sub output-for-gui(Agrammon::Model $model,
     );
 }
 
-sub get-data($model, $outputs, $include-filters, @print-set, $short, $language?) {
+sub get-data($model, $outputs, $include-filters, @print-set, $short, $language?, :$merge-filters) {
     my @records;
     my $last-order = -1;
     for sorted-kv($outputs.get-outputs-hash) -> $module, $_ {
@@ -36,10 +36,16 @@ sub get-data($model, $outputs, $include-filters, @print-set, $short, $language?)
             for sorted-kv($_) -> $output, $raw-value {
                 my $var = $module ~ '::' ~ $output;
                 my $order = $model.output-labels($module, $output)<sort> || $last-order;
-                push @records, make-record($module, $output, $model, $raw-value, $var, $order, $short, :$language, :@print-set);
+                my $record = make-record($module, $output, $model, $raw-value, $var, $order, $short, :$language, :@print-set);
+                push @records, $record;
                 if $include-filters {
                     if $raw-value ~~ Agrammon::Outputs::FilterGroupCollection && $raw-value.has-filters {
-                        add-filters(@records, $module, $output, $model, $raw-value, $var, $order, $short, :@print-set);
+                        if $merge-filters {
+                            merge-filters($record, $module, $output, $model, $raw-value, $var, $order, $short, $language, :@print-set);
+                        }
+                        else {
+                            add-filters(@records, $module, $output, $model, $raw-value, $var, $order, $short, :@print-set);
+                        }
                     }
                 }
                 $last-order = $order;
@@ -52,10 +58,16 @@ sub get-data($model, $outputs, $include-filters, @print-set, $short, $language?)
                     for sorted-kv(%values) -> $output, $raw-value {
                         my $order = $model.output-labels($fq-name, $output)<sort> || $last-order;
                         my $var = $q-name ~ '::' ~ $output;
-                        push @records, make-record($fq-name, $output, $model, $raw-value, $var, $order, $short, $instance-id, :$language, :@print-set);
+                        my $record =  make-record($fq-name, $output, $model, $raw-value, $var, $order, $short, $instance-id, :$language, :@print-set);
+                        push @records, $record;
                         if $include-filters {
                             if $raw-value ~~ Agrammon::Outputs::FilterGroupCollection && $raw-value.has-filters {
-                                add-filters(@records, $fq-name, $output, $model, $raw-value, $var, $order, $short, :@print-set);
+                                if $merge-filters {
+                                    merge-filters($record, $fq-name, $output, $model, $raw-value, $var, $order, $short, $language, :@print-set);
+                                }
+                                else {
+                                    add-filters(@records, $fq-name, $output, $model, $raw-value, $var, $order, $short, :@print-set);
+                                }
                             }
                         }
                         $last-order = $order;
@@ -108,8 +120,8 @@ sub make-record($fq-name, $output, $model, $raw-value, $var, $order, $short, $in
 }
 
 sub add-filters(@records, $fq-name, $output, $model,
-                 Agrammon::Outputs::FilterGroupCollection $collection,
-                 $var, $order, $sort, :@print-set) {
+                Agrammon::Outputs::FilterGroupCollection $collection,
+                $var, $order, $sort, :@print-set) {
     for $collection.results-by-filter-group {
         my %keyFilters := .key;
         my @filters = translate-filter-keys($model, %keyFilters).map: -> $trans { %( label => $trans.key, enum => $trans.value ) };
@@ -117,3 +129,25 @@ sub add-filters(@records, $fq-name, $output, $model,
         push @records, make-record($fq-name, $output, $model, $value, $var, $order, $sort, :@print-set, :@filters);
     }
 }
+
+sub merge-filters($record, $fq-name, $output, $model,
+                Agrammon::Outputs::FilterGroupCollection $collection,
+                $var, $order, $sort, $language?, :@print-set) {
+    warn "JSON formatter must be extended for multiple filter groups" if @filters.elems > 1;
+    for $collection.results-by-filter-group {
+        my %keyFilters := .key;
+        my @filters = translate-filter-keys($model, %keyFilters).map: -> $trans { %( label => $trans.key, enum => $trans.value ) };
+        my $value := .value;
+#        TODO: make this an option
+#        next unless $value;
+        my $filter-record =  make-record($fq-name, $output, $model, $value, $var, $order, $sort, :@print-set, :@filters);
+        dd $filter-record;
+        push $record<values>, %( :label($filter-record<filters>[0]<enum>{$language}), :value($filter-record<fullValue>));
+    }
+    push $record<values>, %( :label($record<label>:delete), :value($record<fullValue>:delete));
+    $record<order>:delete;
+    $record<format>:delete;
+    $record<value>:delete;
+    $record<filters>:delete;
+    return $record;
+}

From c72b03bdf53f974c25c995ec863f8a4a38f54134 Mon Sep 17 00:00:00 2001
From: Fritz Zaucker <fritz.zaucker@oetiker.ch>
Date: Wed, 15 Jun 2022 14:09:41 +0200
Subject: [PATCH 04/12] Add compact JSON output

---
 lib/Agrammon/Web/APIRoutes.pm6 | 5 ++++-
 lib/Agrammon/Web/Service.pm6   | 6 ++++--
 share/agrammon-rest.openapi    | 6 ++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/Agrammon/Web/APIRoutes.pm6 b/lib/Agrammon/Web/APIRoutes.pm6
index 09c0f4f3..8b5de9fb 100644
--- a/lib/Agrammon/Web/APIRoutes.pm6
+++ b/lib/Agrammon/Web/APIRoutes.pm6
@@ -88,7 +88,9 @@ sub rest-api-routes (Str $schema, Agrammon::Web::Service $ws) is export {
             request-body 'multipart/form-data' => -> (
                 :$simulation!,  :$dataset!, :$inputs!, :$technical='',
                 :$model = 'version6', :$variants = 'Base', :$language = 'de',
-                :$print-only = '', :$include-filters = 'false', :$all-filters = 'false'
+                :$print-only = '',
+                :$compact-output = 'true',
+                :$include-filters = 'false', :$all-filters = 'false'
             ) {
                 my $type = $inputs.content-type;
                 if not ($type eq 'application/json' or $type eq 'text/csv') {
@@ -103,6 +105,7 @@ sub rest-api-routes (Str $schema, Agrammon::Web::Service $ws) is export {
                         ~$simulation, ~$dataset, $input-data, ~$type,
                         :model-version(~$model), :variants(~$variants), :technical-file(~$technical),
                         :language(~$language), :format($accept), :print-only(~$print-only),
+                        :$compact-output,
                         :include-filters($include-filters eq 'true'), :all-filters($all-filters eq 'true')
                     );
                     if $accept eq 'application/json' {
diff --git a/lib/Agrammon/Web/Service.pm6 b/lib/Agrammon/Web/Service.pm6
index eed150b7..f750c93a 100644
--- a/lib/Agrammon/Web/Service.pm6
+++ b/lib/Agrammon/Web/Service.pm6
@@ -291,7 +291,7 @@ class Agrammon::Web::Service {
         Str $simulation-name, Str $dataset-name, $input-data, InputFormats $type,
         :$model-version, :$variants, :$technical-file,
         :$language = 'de', OutputFormats :$format!, :$print-only,
-        :$include-filters = False, :$all-filters = False
+        :$include-filters = False, :$all-filters = False, :$compact-output
     ) {
         my $data-source = do given $type {
             when 'text/csv'         { Agrammon::DataSource::CSV.new }
@@ -329,6 +329,7 @@ class Agrammon::Web::Service {
         my $outputs = $!model.run(:$input, :%technical);
 
         my @print-set = ($print-only).split(',') if $print-only;
+        my $short = $compact-output eq 'true';
         my $result;
         given $format {
             when 'text/csv' {
@@ -340,7 +341,8 @@ class Agrammon::Web::Service {
             }
             when 'application/json' {
                 $result = output-as-json(
-                    $!model, $outputs, $language, @print-set, $include-filters, :$all-filters
+                    $!model, $outputs, $language, @print-set, $include-filters, :$all-filters,
+                    :$short
                 );
             }
             when 'text/plain' {
diff --git a/share/agrammon-rest.openapi b/share/agrammon-rest.openapi
index ccd78321..a9c51b70 100644
--- a/share/agrammon-rest.openapi
+++ b/share/agrammon-rest.openapi
@@ -229,6 +229,12 @@ components:
                     enum:
                         - 'true'
                         - 'false'
+                compact-output:
+                    description: compact instead of full output
+                    type: string
+                    enum:
+                        - 'true'
+                        - 'false'
         Error:
             required:
                 - error

From 98621f1538138fb76a3e836c0ceaa0dd9d05fa99 Mon Sep 17 00:00:00 2001
From: Fritz Zaucker <fritz.zaucker@oetiker.ch>
Date: Wed, 15 Jun 2022 14:10:10 +0200
Subject: [PATCH 05/12] Remove wrong warning

---
 lib/Agrammon/OutputFormatter/JSON.pm6 | 1 -
 lib/Agrammon/OutputFormatter/Text.pm6 | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/Agrammon/OutputFormatter/JSON.pm6 b/lib/Agrammon/OutputFormatter/JSON.pm6
index 2ff4ccee..5727ad02 100644
--- a/lib/Agrammon/OutputFormatter/JSON.pm6
+++ b/lib/Agrammon/OutputFormatter/JSON.pm6
@@ -133,7 +133,6 @@ sub add-filters(@records, $fq-name, $output, $model,
 sub merge-filters($record, $fq-name, $output, $model,
                 Agrammon::Outputs::FilterGroupCollection $collection,
                 $var, $order, $sort, $language?, :@print-set) {
-    warn "JSON formatter must be extended for multiple filter groups" if @filters.elems > 1;
     for $collection.results-by-filter-group {
         my %keyFilters := .key;
         my @filters = translate-filter-keys($model, %keyFilters).map: -> $trans { %( label => $trans.key, enum => $trans.value ) };
diff --git a/lib/Agrammon/OutputFormatter/Text.pm6 b/lib/Agrammon/OutputFormatter/Text.pm6
index 472b5885..6907c73c 100644
--- a/lib/Agrammon/OutputFormatter/Text.pm6
+++ b/lib/Agrammon/OutputFormatter/Text.pm6
@@ -77,7 +77,6 @@ sub add-filters(@module-lines, Agrammon::Outputs::FilterGroupCollection $collect
         $unit, Str $prefix, Bool :$all-filters) {
     my @results = $collection.results-by-filter-group(:all($all-filters));
     my $longest-filter = @results.map({ .key.map({ .key.chars + .value.chars }) }).flat.max + 1;
-    warn "TEXT formatter might have to be extended for multiple filter groups" if @filters.elems > 1;
     for @results {
         my %filters := .key;
         my $value := .value;

From 259f54ab95d241092ccd0889955e46ee79afee51 Mon Sep 17 00:00:00 2001
From: Fritz Zaucker <fritz.zaucker@oetiker.ch>
Date: Wed, 15 Jun 2022 14:14:31 +0200
Subject: [PATCH 06/12] Remove debug output

---
 lib/Agrammon/OutputFormatter/JSON.pm6 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Agrammon/OutputFormatter/JSON.pm6 b/lib/Agrammon/OutputFormatter/JSON.pm6
index 5727ad02..5055ef9d 100644
--- a/lib/Agrammon/OutputFormatter/JSON.pm6
+++ b/lib/Agrammon/OutputFormatter/JSON.pm6
@@ -140,7 +140,6 @@ sub merge-filters($record, $fq-name, $output, $model,
 #        TODO: make this an option
 #        next unless $value;
         my $filter-record =  make-record($fq-name, $output, $model, $value, $var, $order, $sort, :@print-set, :@filters);
-        dd $filter-record;
         push $record<values>, %( :label($filter-record<filters>[0]<enum>{$language}), :value($filter-record<fullValue>));
     }
     push $record<values>, %( :label($record<label>:delete), :value($record<fullValue>:delete));

From c10c76a1c0c0065d088030e28ca89b4ce22d3499 Mon Sep 17 00:00:00 2001
From: Fritz Zaucker <fritz.zaucker@oetiker.ch>
Date: Wed, 15 Jun 2022 14:43:15 +0200
Subject: [PATCH 07/12] Adapt test

---
 t/model-with-filters.t | 137 +++++------------------------------------
 1 file changed, 16 insertions(+), 121 deletions(-)

diff --git a/t/model-with-filters.t b/t/model-with-filters.t
index 1c38457a..59956779 100644
--- a/t/model-with-filters.t
+++ b/t/model-with-filters.t
@@ -177,135 +177,30 @@ subtest 'Running the model produces output instances with filters' => {
         is to-json($json, :sorted-keys) ~ "\n", q:to/OUTPUT/, "Correct JSON output";
             [
               {
-                "filters": [
-                ],
-                "format": "%.0f",
-                "fullValue": 141.003688,
-                "label": null,
-                "order": -1,
                 "print": "OtherPigFlux",
                 "unit": "kg N/year",
-                "value": "141",
-                "var": "SummaryByAnimalCategory::n_excretion_otherpig"
-              },
-              {
-                "filters": [
+                "values": [
                   {
-                    "enum": {
-                      "de": "Säugende Sauen",
-                      "en": "nursing sows",
-                      "fr": "Truies allaitantes",
-                      "it": "nursing sows"
-                    },
-                    "label": {
-                      "de": "Tierkategorie",
-                      "en": "Animal category",
-                      "fr": "Catégorie d'animaux"
-                    }
-                  }
-                ],
-                "format": "%.0f",
-                "fullValue": 88.156444,
-                "labels": {
-                },
-                "order": -1,
-                "print": "OtherPigFlux",
-                "units": {
-                  "de": "kg N/Jahr",
-                  "en": "kg N/year",
-                  "fr": "kg N/an"
-                },
-                "value": "88",
-                "var": "SummaryByAnimalCategory::n_excretion_otherpig"
-              },
-              {
-                "filters": [
+                    "label": "nursing sows",
+                    "value": 88.156444
+                  },
                   {
-                    "enum": {
-                      "de": "Galtsauen",
-                      "en": "dry sows",
-                      "fr": "Truies gestantes",
-                      "it": "dry sows"
-                    },
-                    "label": {
-                      "de": "Tierkategorie",
-                      "en": "Animal category",
-                      "fr": "Catégorie d'animaux"
-                    }
-                  }
-                ],
-                "format": "%.0f",
-                "fullValue": 0.0,
-                "labels": {
-                },
-                "order": -1,
-                "print": "OtherPigFlux",
-                "units": {
-                  "de": "kg N/Jahr",
-                  "en": "kg N/year",
-                  "fr": "kg N/an"
-                },
-                "value": "0",
-                "var": "SummaryByAnimalCategory::n_excretion_otherpig"
-              },
-              {
-                "filters": [
+                    "label": "dry sows",
+                    "value": 0.0
+                  },
                   {
-                    "enum": {
-                      "de": "Ferkel abgesetzt bis 25 kg",
-                      "en": "weaned piglets up to 25kg",
-                      "fr": "Porcelets sevrés jusqu' à 25 kg",
-                      "it": "weaned piglets up to 25kg"
-                    },
-                    "label": {
-                      "de": "Tierkategorie",
-                      "en": "Animal category",
-                      "fr": "Catégorie d'animaux"
-                    }
-                  }
-                ],
-                "format": "%.0f",
-                "fullValue": 20.826,
-                "labels": {
-                },
-                "order": -1,
-                "print": "OtherPigFlux",
-                "units": {
-                  "de": "kg N/Jahr",
-                  "en": "kg N/year",
-                  "fr": "kg N/an"
-                },
-                "value": "21",
-                "var": "SummaryByAnimalCategory::n_excretion_otherpig"
-              },
-              {
-                "filters": [
+                    "label": "weaned piglets up to 25kg",
+                    "value": 20.826
+                  },
                   {
-                    "enum": {
-                      "de": "Eber",
-                      "en": "boars",
-                      "fr": "Verrats",
-                      "it": "boars"
-                    },
-                    "label": {
-                      "de": "Tierkategorie",
-                      "en": "Animal category",
-                      "fr": "Catégorie d'animaux"
-                    }
+                    "label": "boars",
+                    "value": 32.021244
+                  },
+                  {
+                    "label": null,
+                    "value": 141.003688
                   }
                 ],
-                "format": "%.0f",
-                "fullValue": 32.021244,
-                "labels": {
-                },
-                "order": -1,
-                "print": "OtherPigFlux",
-                "units": {
-                  "de": "kg N/Jahr",
-                  "en": "kg N/year",
-                  "fr": "kg N/an"
-                },
-                "value": "32",
                 "var": "SummaryByAnimalCategory::n_excretion_otherpig"
               },
               {

From 0751d65f2c791fa70b94eb07fa08f4396faba3d2 Mon Sep 17 00:00:00 2001
From: Fritz Zaucker <fritz.zaucker@oetiker.ch>
Date: Wed, 15 Jun 2022 15:14:55 +0200
Subject: [PATCH 08/12] Add additional parameter

---
 t/apiroutes.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/apiroutes.t b/t/apiroutes.t
index a54a4836..3b838d66 100644
--- a/t/apiroutes.t
+++ b/t/apiroutes.t
@@ -33,7 +33,7 @@ my $fake-store = mocked(Agrammon::Web::Service,
         get-outputs-for-rest => -> Str $simulation-name, Str $dataset-name, Str $csv-data, $type,
                                        :$model-version, :$variants, :$technical-file,
                                        :$language, :$format, :$print-only,
-                                        :$include-filters, :$all-filters {
+                                        :$include-filters, :$all-filters, :$compact-output {
             "Test results"
         },
     }

From b6002434b022cd827ef0d9a93d8f6aeab2033e77 Mon Sep 17 00:00:00 2001
From: Fritz Zaucker <fritz.zaucker@oetiker.ch>
Date: Wed, 15 Jun 2022 15:34:44 +0200
Subject: [PATCH 09/12] Add total label in filtered output

---
 lib/Agrammon/OutputFormatter/CSV.pm6 | 7 +++----
 t/model-with-filters.t               | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/Agrammon/OutputFormatter/CSV.pm6 b/lib/Agrammon/OutputFormatter/CSV.pm6
index 0c58348a..b231b4bb 100644
--- a/lib/Agrammon/OutputFormatter/CSV.pm6
+++ b/lib/Agrammon/OutputFormatter/CSV.pm6
@@ -16,11 +16,11 @@ sub output-as-csv(
 ) is export {
     return (gather for sorted-kv($outputs.get-outputs-hash) -> $module, $_ {
         my $prefix = "$simulation-name;$dataset-id" if $simulation-name;
+        my $filters = $include-filters ?? 'total' !! '';
         when Hash {
             for sorted-kv($_) -> $output, $value {
                 next unless $model.should-print($module, $output, @print-set);
 
-                my $filters = '';
                 my $raw-value = $value;
                 my $var = $output;
                 my $unit = $model.output-unit($module, $output, $language);
@@ -42,7 +42,6 @@ sub output-as-csv(
         }
         when Array {
             for sorted-kv($_) -> $instance-id, %instance-outputs {
-                my $filters = '';
                 for sorted-kv(%instance-outputs) -> $fq-name, %values {
                     my $q-name = module-with-instance($module, $instance-id, $fq-name);
                     for sorted-kv(%values) -> $output, $value {
@@ -82,8 +81,8 @@ sub add-filters(Agrammon::Outputs::FilterGroupCollection $collection,
         for (@filters || ( :value('Uncategorized') ) ) {
             my @data = (
                 |($prefix if $prefix),
-                $q-name,
-                $fq-name,
+                $q-name,  # module
+                $fq-name, # variable
                 .<value>,
                 flat-value($raw-value) // '',
                 $unit
diff --git a/t/model-with-filters.t b/t/model-with-filters.t
index 59956779..2ef8c5c1 100644
--- a/t/model-with-filters.t
+++ b/t/model-with-filters.t
@@ -153,12 +153,12 @@ subtest 'Running the model produces output instances with filters' => {
 
         my $csv = output-as-csv('Demo', 'Test', $model, $output, "en", @print-set, $include-filters) ~ "\n";
         is $csv, q:to/OUTPUT/, 'Correct CSV output';
-            Demo;Test;SummaryByAnimalCategory;n_excretion_otherpig;;141.003688;kg N/year
+            Demo;Test;SummaryByAnimalCategory;n_excretion_otherpig;total;141.003688;kg N/year
             Demo;Test;SummaryByAnimalCategory;n_excretion_otherpig;nursing_sows;88.156444;kg N/year
             Demo;Test;SummaryByAnimalCategory;n_excretion_otherpig;dry_sows;0;kg N/year
             Demo;Test;SummaryByAnimalCategory;n_excretion_otherpig;weaned_piglets_up_to_25kg;20.826;kg N/year
             Demo;Test;SummaryByAnimalCategory;n_excretion_otherpig;boars;32.021244;kg N/year
-            Demo;Test;Total;nh3_nanimalproduction;;352.7111423399035;kg N/year
+            Demo;Test;Total;nh3_nanimalproduction;total;352.7111423399035;kg N/year
             OUTPUT
 
         my $text = output-as-text($model, $output, "en", @print-set, $include-filters) ~ "\n";

From cf775664e4896796c57dcf25ca9de7d0ea16149d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20H=C3=A4ni?= <christoph.haeni@bfh.ch>
Date: Thu, 9 Jun 2022 14:32:50 +0200
Subject: [PATCH 10/12] Set share indoor for Slurry_Label_Open to 0

---
 .../version6/Livestock/Pig/Housing/Type.nhd       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/share/Models/version6/Livestock/Pig/Housing/Type.nhd b/share/Models/version6/Livestock/Pig/Housing/Type.nhd
index 7677a207..115e4e57 100644
--- a/share/Models/version6/Livestock/Pig/Housing/Type.nhd
+++ b/share/Models/version6/Livestock/Pig/Housing/Type.nhd
@@ -192,11 +192,16 @@ Selects the emission rate and other correciton factors for the specific housing
   ++description
     Factor for considering grazing part.
   ++formula 
-    if ( Out(housing_type) eq 'Slurry_Label' or Out(housing_type) eq 'Slurry_Label_Open' ) {
-       return 0.5;
-    }
-    else {
-       return 1;
+    given ( Out(housing_type) ) {
+        when 'Slurry_Label' {
+            return 0.5;
+        }
+        when 'Slurry_Label_Open' {
+            return 0;
+        }
+        default { 
+            return 1; 
+        }
     }
 
 

From c6eff8e8450c1df82270cc1cc786b40660025a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20H=C3=A4ni?= <christoph.haeni@bfh.ch>
Date: Thu, 9 Jun 2022 14:38:51 +0200
Subject: [PATCH 11/12] Floor mitigation options for both indoor and outdoor

---
 .../Models/version6/Livestock/Pig/Housing.nhd |  7 ++++---
 .../Pig/Housing/MitigationOptions.nhd         | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/share/Models/version6/Livestock/Pig/Housing.nhd b/share/Models/version6/Livestock/Pig/Housing.nhd
index fd7b8acf..6208a77a 100644
--- a/share/Models/version6/Livestock/Pig/Housing.nhd
+++ b/share/Models/version6/Livestock/Pig/Housing.nhd
@@ -73,7 +73,7 @@ taxonomy = Livestock::Pig::Housing
     my $ef = Val(er_housing, Housing::Type) * 
               Val(c_free_factor_housing, Housing::CFreeFactor) *
               Val(c_area, Housing::Type) *
-              (1 - Val(red_housing_floor, Housing::MitigationOptions)) * 
+              (1 - Val(red_housing_floor_indoor, Housing::MitigationOptions)) * 
               (1 - Val(red_housing_air, Housing::MitigationOptions));
     if ( $ef > 1 ) {
         writeLog({
@@ -97,7 +97,7 @@ taxonomy = Livestock::Pig::Housing
     Out(ef_housing_indoor_before_air_scrubber) *
     (1 - Val(red_air_scrubber, Housing::AirScrubber));
 
-+ef_housing_grazing
++ef_housing_outdoor
   print = Pig
   ++units
      en = -
@@ -108,6 +108,7 @@ taxonomy = Livestock::Pig::Housing
   ++formula
     my $ef = Val(er_housing, Housing::Type) * 
               Val(c_free_factor_housing, Housing::CFreeFactor) *
+              (1 - Val(red_housing_floor_outdoor, Housing::MitigationOptions)) * 
               Val(c_area, Housing::Type);
     if ( $ef > 1 ) {
         writeLog({
@@ -131,7 +132,7 @@ taxonomy = Livestock::Pig::Housing
     # indoor part
     Val(share_indoor, Housing::Type) * Out(ef_housing_indoor) +
     # grazing part
-    (1 - Val(share_indoor, Housing::Type)) * Out(ef_housing_grazing);
+    (1 - Val(share_indoor, Housing::Type)) * Out(ef_housing_outdoor);
 
 +nh3_nhousing
   print = Pig
diff --git a/share/Models/version6/Livestock/Pig/Housing/MitigationOptions.nhd b/share/Models/version6/Livestock/Pig/Housing/MitigationOptions.nhd
index 458f5237..6a9b0d21 100644
--- a/share/Models/version6/Livestock/Pig/Housing/MitigationOptions.nhd
+++ b/share/Models/version6/Livestock/Pig/Housing/MitigationOptions.nhd
@@ -91,12 +91,25 @@ UNECE 2007. Guidance document on control techniques for preventing and abating e
 
 *** output ***
 
-+red_housing_floor
++red_housing_floor_indoor
   print = Pig
   ++units 
     en = -
   ++description
-    Reduction factor for the emission due to UNECE housing systems tasks for fully and partly slatted floors.
+    Reduction factor for the emission due to floor related mitigation strategies - part indoor.
+  ++formula
+    given ( In(mitigation_housing_floor) ) {
+      when 'none' {
+        0;
+      }
+    }
+
++red_housing_floor_outdoor
+  print = Pig
+  ++units 
+    en = -
+  ++description
+    Reduction factor for the emission due to floor related mitigation strategies - part outdoor.
   ++formula
     given ( In(mitigation_housing_floor) ) {
       when 'none' {
@@ -109,7 +122,7 @@ UNECE 2007. Guidance document on control techniques for preventing and abating e
   ++units 
     en = -
   ++description
-    Reduction factor for the emission due to the use of housing system adaptations.
+    Reduction factor for the emission due to the use of housing system adaptations (only indoor).
   ++formula 
       if (In(mitigation_housing_air)  eq 'low_impuls_air_supply'){
           return( Tech(red_low_impuls_air_supply));

From 857529219c1c3bdcf876926c0e1fa8eedb09adde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20H=C3=A4ni?= <christoph.haeni@bfh.ch>
Date: Thu, 9 Jun 2022 15:09:05 +0200
Subject: [PATCH 12/12] Add changelog entry

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a74b5d2f..d38eeab0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Agrammon Change Log
 
-  - extend REST inputTemplate for json
+
+- feature branch floor_mitigation, 2022-06-09, christoph.haeni@bfh.ch
+
+  - pigs: 
+    - floor mitigation has effect on both indoors and outdoors
+    - Slurry_Label_Open has 100% flow into outdoors
 
 - pre, 2022-06-09, christoph.haeni@bfh.ch