From aede0a82fefa3714d680fc5887fc57ca6929e458 Mon Sep 17 00:00:00 2001 From: Scott Horowitz Date: Thu, 12 May 2022 16:44:29 -0600 Subject: [PATCH 1/2] Fix possible bug when there are multiple vented crawlspaces/attics defined. --- HPXMLtoOpenStudio/measure.xml | 16 ++++++++-------- HPXMLtoOpenStudio/resources/airflow.rb | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml index 6cd2753286..e8abb14386 100644 --- a/HPXMLtoOpenStudio/measure.xml +++ b/HPXMLtoOpenStudio/measure.xml @@ -3,8 +3,8 @@ 3.0 hpxm_lto_openstudio b1543b30-9465-45ff-ba04-1d1f85e763bc - 0f575b7c-f7f0-4525-abc9-7fa5d4ffaa56 - 20220512T220046Z + b746a7ae-4798-44c1-a869-3b51d1159ad1 + 20220512T224221Z D8922A73 HPXMLtoOpenStudio HPXML to OpenStudio Translator @@ -367,12 +367,6 @@ test 32CF1B56 - - airflow.rb - rb - resource - 48BA24A4 - meta_measure.rb rb @@ -582,5 +576,11 @@ resource C2F66DD0 + + airflow.rb + rb + resource + C9BF52CD + diff --git a/HPXMLtoOpenStudio/resources/airflow.rb b/HPXMLtoOpenStudio/resources/airflow.rb index 2b9c41a472..46b449f03c 100644 --- a/HPXMLtoOpenStudio/resources/airflow.rb +++ b/HPXMLtoOpenStudio/resources/airflow.rb @@ -98,12 +98,14 @@ def self.apply(model, runner, weather, spaces, hpxml, cfa, nbeds, next unless attic.attic_type == HPXML::AtticTypeVented vented_attic = attic + break end vented_crawl = nil hpxml.foundations.each do |foundation| next unless foundation.foundation_type == HPXML::FoundationTypeCrawlspaceVented vented_crawl = foundation + break end apply_natural_ventilation_and_whole_house_fan(model, weather, hpxml.site, vent_fans_whf, open_window_area, clg_ssn_sensor) From 2ce33f78bffce16269b04338a6efacdaa1943d5e Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 12 May 2022 23:24:24 +0000 Subject: [PATCH 2/2] Latest results. --- workflow/tests/base_results/results.csv | 10 +++++----- workflow/tests/base_results/results_bills.csv | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/workflow/tests/base_results/results.csv b/workflow/tests/base_results/results.csv index b6796a00bc..e7962db20d 100644 --- a/workflow/tests/base_results/results.csv +++ b/workflow/tests/base_results/results.csv @@ -373,15 +373,15 @@ house012.xml,35.37,35.37,35.37,35.37,0.0,0.0,0.0,0.0,0.0,0.0,4.676,0.0,0.238,5.4 house013.xml,30.516,30.516,30.516,30.516,0.0,0.0,0.0,0.0,0.0,0.0,2.783,0.0,0.16,3.835,1.294,7.706,0.0,0.0,3.966,0.0,0.455,0.001,0.0,0.0,0.0,1.52,0.0,0.0,0.366,0.286,2.129,1.395,0.0,1.879,2.742,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.881,14.947,6.85,0.853,0.0,0.0,0.0,0.0,2598.3,2104.0,9.217,9.329,0.0,1.636,2.868,0.0,0.0,0.655,0.545,0.0,1.906,0.0,-0.269,1.521,0.0,1.063,0.0,1.114,-5.183,0.0,1.077,0.375,0.0,0.0,-0.094,4.017,0.0,0.6,0.0,-0.267,-0.253,-0.436,-0.28,0.0,1.47,8.822,1364.1,1290.1,8207.3,3131.8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house014.xml,31.42,31.42,31.42,31.42,0.0,0.0,0.0,0.0,0.0,0.0,3.31,0.001,0.195,4.138,1.395,7.451,0.0,0.0,4.053,0.0,0.46,0.001,0.0,0.0,0.0,1.52,0.0,0.0,0.366,0.286,2.129,1.395,0.0,1.879,2.841,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,7.283,16.201,6.85,0.597,0.0,0.0,0.0,0.0,2641.8,2188.1,10.543,10.13,0.0,1.709,3.707,0.0,0.0,0.585,0.621,0.0,2.027,0.0,-0.229,1.728,0.0,1.119,0.0,1.4,-5.421,0.0,1.141,0.557,0.0,0.0,-0.069,5.037,0.0,0.691,0.0,-0.227,-0.248,-0.495,-0.258,0.0,1.656,8.501,1364.1,1290.1,8207.3,3131.8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house015.xml,30.516,30.516,30.516,30.516,0.0,0.0,0.0,0.0,0.0,0.0,2.783,0.0,0.16,3.835,1.294,7.706,0.0,0.0,3.966,0.0,0.455,0.001,0.0,0.0,0.0,1.52,0.0,0.0,0.366,0.286,2.129,1.395,0.0,1.879,2.742,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.881,14.947,6.85,0.853,0.0,0.0,0.0,0.0,2598.3,2104.0,9.217,9.329,0.0,1.636,2.868,0.0,0.0,0.655,0.545,0.0,1.906,0.0,-0.269,1.521,0.0,1.063,0.0,1.114,-5.183,0.0,1.077,0.375,0.0,0.0,-0.094,4.017,0.0,0.6,0.0,-0.267,-0.253,-0.436,-0.28,0.0,1.47,8.822,1364.1,1290.1,8207.3,3131.8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -house016.xml,57.296,57.296,38.486,38.486,0.0,0.0,18.81,0.0,0.0,0.0,6.49,0.125,0.464,3.33,1.128,0.0,0.0,0.0,8.606,0.0,0.723,0.215,0.0,0.0,0.0,2.448,0.0,0.0,0.447,0.338,2.514,1.528,0.0,2.114,8.015,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.217,0.0,13.593,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.402,13.252,9.378,0.0,0.0,0.0,0.0,20.0,7122.5,3641.7,41.861,20.381,0.0,3.888,10.368,0.629,5.281,0.303,-0.484,0.0,0.0,4.031,-0.063,5.774,0.0,3.866,0.0,0.0,-13.297,0.0,0.773,0.268,-0.036,2.943,-0.053,11.646,0.0,0.0,-8.033,-0.018,-1.421,-2.827,-1.059,0.0,0.0,11.561,1610.9,1574.7,11979.5,4221.7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +house016.xml,57.285,57.285,38.257,38.257,0.0,0.0,19.028,0.0,0.0,0.0,6.727,0.129,0.482,2.97,1.001,0.0,0.0,0.0,8.606,0.0,0.723,0.215,0.0,0.0,0.0,2.448,0.0,0.0,0.447,0.338,2.514,1.528,0.0,2.114,8.015,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.435,0.0,13.593,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.255,11.649,9.378,0.0,0.0,0.0,0.0,15.0,7136.3,3539.2,42.133,19.33,0.0,4.45,10.949,0.625,5.21,0.301,-0.531,0.0,0.0,3.9,-0.065,5.752,0.0,3.871,0.0,0.0,-13.308,0.0,-0.366,-0.914,-0.025,3.044,-0.048,11.763,0.0,0.0,-7.818,-0.021,-1.373,-2.64,-1.021,0.0,0.0,11.549,1610.9,1574.7,11979.5,4221.7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house017.xml,89.731,89.731,28.1,28.1,61.63,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.197,4.387,0.735,0.0,0.0,0.0,4.67,0.187,0.387,0.033,0.0,0.0,0.0,2.086,0.0,0.0,0.528,0.39,2.899,1.661,0.0,2.35,6.591,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,42.779,0.0,18.852,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,39.187,10.125,11.749,3.412,0.0,0.0,149.0,97.0,1735.9,3534.1,60.162,19.289,0.0,5.47,14.76,0.657,9.93,0.365,-2.248,0.0,0.699,2.583,-0.054,19.857,0.0,1.221,0.0,0.0,-14.258,0.0,-0.186,-1.088,-0.025,4.803,-0.062,6.947,0.0,-0.001,-4.357,0.016,-2.782,-1.782,-0.262,0.0,0.0,8.953,1857.7,1859.4,14839.1,4834.2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house018.xml,38.751,38.751,38.751,38.751,0.0,0.0,0.0,0.0,0.0,0.0,4.304,0.0,0.19,2.546,0.779,9.931,0.0,0.0,4.761,0.0,0.461,0.112,0.0,0.0,0.0,4.21,0.0,0.0,0.447,0.338,2.514,1.528,0.0,2.114,4.516,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,7.903,9.344,9.377,0.552,0.0,0.0,0.0,0.0,4865.8,2767.9,19.628,11.162,0.0,4.608,4.669,0.0,0.0,0.278,-0.067,0.0,1.823,0.0,-0.023,2.633,0.0,2.087,0.0,1.571,-9.788,0.0,-0.532,-0.818,0.0,0.0,-0.096,3.383,0.0,0.09,0.0,-0.016,-0.768,-1.399,-0.75,0.0,1.281,9.191,1610.9,1574.7,11983.2,4223.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house019.xml,131.873,131.873,55.031,55.031,76.841,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.101,11.317,3.796,11.933,0.0,0.0,8.923,0.0,0.741,0.054,0.0,0.0,0.0,2.005,1.27,0.0,0.447,0.338,2.514,0.105,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,73.772,0.0,0.0,0.0,3.069,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,66.842,44.698,10.1,1.826,0.0,0.0,190.0,275.0,2882.0,6701.2,84.092,46.085,0.0,11.4,44.835,0.651,4.676,1.919,1.559,0.0,0.0,5.15,-0.037,8.869,0.0,1.864,0.0,0.0,-15.555,0.0,2.954,9.959,0.146,2.825,0.262,19.801,0.0,0.0,-4.186,-0.011,-0.178,-0.35,0.017,0.0,0.0,12.149,1610.9,1574.7,10370.6,3654.8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house020.xml,111.817,111.817,55.907,55.907,0.0,0.0,55.91,0.0,0.0,0.0,0.0,0.0,0.756,12.883,2.829,0.0,0.0,0.0,12.75,0.0,0.892,0.026,0.0,0.0,0.0,3.976,0.0,0.0,0.447,0.338,2.514,0.105,0.0,2.114,16.277,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.349,0.0,17.492,0.0,3.069,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,32.561,33.426,9.377,4.221,0.0,0.0,0.0,0.0,2662.7,6572.0,30.346,32.562,0.911,11.042,10.616,1.137,9.306,0.635,-0.716,0.0,0.0,5.394,-0.12,15.224,0.0,0.835,0.0,0.0,-22.061,0.243,0.14,0.168,0.051,6.537,0.012,19.821,0.0,0.0,-6.053,-0.025,-2.712,-3.615,-0.198,0.0,0.0,19.221,1610.9,1574.7,11983.5,4223.2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -house021.xml,153.828,153.828,48.421,48.421,105.406,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.911,7.996,1.611,0.0,0.0,0.0,10.64,0.244,0.771,0.071,0.0,0.0,0.0,2.448,1.472,0.0,0.528,0.39,2.899,1.661,0.0,2.35,13.43,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,85.391,0.0,20.015,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,70.219,19.746,11.749,3.811,0.0,0.0,0.0,0.0,2752.2,4947.9,79.046,25.659,0.0,7.338,27.104,2.426,8.862,0.86,0.805,0.0,1.075,8.369,-0.369,26.6,0.0,2.484,0.0,5.547,-21.486,0.0,0.991,-0.959,-0.003,2.239,-0.096,13.956,0.0,0.043,-5.89,-0.295,-2.487,-2.039,-0.398,0.0,2.03,12.811,1857.7,1859.4,14839.1,4834.2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +house021.xml,154.748,154.748,47.925,47.925,106.823,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.942,7.568,1.511,0.0,0.0,0.0,10.64,0.244,0.771,0.071,0.0,0.0,0.0,2.448,1.472,0.0,0.528,0.39,2.899,1.661,0.0,2.35,13.43,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,86.804,0.0,20.019,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,71.376,18.267,11.749,3.814,0.0,0.0,0.0,0.0,2762.1,4773.1,80.418,23.903,0.0,8.281,27.094,2.425,8.83,0.86,0.753,0.0,1.074,8.351,-0.374,26.616,0.0,2.489,0.0,5.918,-21.553,0.0,0.014,-0.868,0.005,2.256,-0.094,13.984,0.0,0.045,-5.848,-0.3,-2.431,-1.99,-0.39,0.0,1.283,12.747,1857.7,1859.4,14839.3,4834.3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house022.xml,133.288,133.288,47.116,47.116,0.0,86.172,0.0,0.0,0.0,0.0,0.0,0.0,2.143,8.593,1.16,11.316,0.0,0.0,6.69,0.0,0.61,0.034,0.0,0.0,0.0,2.086,1.649,0.0,0.447,0.338,2.514,1.528,0.0,2.114,5.893,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,86.172,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,70.728,19.468,9.834,1.479,0.0,0.0,183.0,127.0,2872.0,5419.1,89.6,27.884,3.723,3.788,20.802,0.0,0.0,1.496,2.934,0.0,12.297,0.0,-0.309,37.72,0.0,1.155,0.0,0.0,-13.692,1.094,0.149,0.502,0.0,0.0,-0.129,11.117,0.0,2.611,0.0,-0.287,-2.732,-1.477,-0.074,0.0,0.0,8.552,1610.9,1574.7,12121.0,4271.6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -house023.xml,129.999,129.999,58.991,58.991,0.0,71.008,0.0,0.0,0.0,0.0,0.0,0.0,1.788,5.865,0.84,17.102,0.0,0.0,9.219,0.0,0.692,0.045,0.0,0.0,0.0,4.21,0.0,0.0,0.528,0.39,2.899,1.661,0.0,2.35,11.402,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,71.008,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,59.282,17.334,14.227,2.767,0.0,0.0,0.0,0.0,3854.4,4408.4,61.122,21.822,0.0,8.774,21.453,1.21,15.98,0.855,1.789,0.0,0.0,4.807,-0.104,23.758,0.0,1.636,0.0,0.0,-21.226,0.0,1.344,-0.987,-0.024,5.982,-0.119,8.572,0.0,0.0,-5.701,-0.005,-2.744,-1.853,-0.325,0.0,0.0,13.298,1857.7,1859.4,6346.2,2067.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -house024.xml,128.412,128.412,38.297,38.297,0.0,90.114,0.0,0.0,0.0,0.0,0.0,0.0,2.241,5.645,1.043,12.274,0.0,0.0,3.916,0.0,0.396,0.058,0.0,0.0,0.0,2.005,0.0,0.0,0.447,0.338,2.514,1.528,0.0,2.114,3.778,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,90.114,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,74.292,17.134,10.188,2.078,0.0,0.0,0.0,0.0,2537.5,3398.9,77.022,19.279,0.0,5.86,29.252,0.0,0.0,0.689,-0.917,0.0,4.287,0.0,-0.12,32.057,0.0,1.837,0.0,11.845,-10.79,0.0,1.677,1.993,0.0,0.0,-0.045,6.248,0.0,0.613,0.0,-0.11,-1.814,-0.795,-0.195,0.0,2.981,6.667,1610.9,1574.7,9900.4,3489.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +house023.xml,131.168,131.168,58.626,58.626,0.0,72.541,0.0,0.0,0.0,0.0,0.0,0.0,1.827,5.519,0.782,17.103,0.0,0.0,9.219,0.0,0.692,0.045,0.0,0.0,0.0,4.21,0.0,0.0,0.528,0.39,2.899,1.661,0.0,2.35,11.402,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,72.541,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,60.562,16.029,14.227,2.769,0.0,0.0,0.0,0.0,3857.7,4311.0,61.58,20.758,0.0,10.235,21.548,1.204,15.87,0.852,1.744,0.0,0.0,4.752,-0.104,23.72,0.0,1.638,0.0,0.0,-21.244,0.0,-0.217,-1.077,-0.017,6.098,-0.115,8.612,0.0,0.0,-5.644,-0.005,-2.691,-1.782,-0.318,0.0,0.0,13.281,1857.7,1859.4,6346.2,2067.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +house024.xml,130.591,130.591,37.864,37.864,0.0,92.728,0.0,0.0,0.0,0.0,0.0,0.0,2.306,5.232,0.956,12.276,0.0,0.0,3.916,0.0,0.396,0.058,0.0,0.0,0.0,2.005,0.0,0.0,0.447,0.338,2.514,1.528,0.0,2.114,3.778,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,92.728,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,76.447,15.565,10.188,2.08,0.0,0.0,0.0,0.0,2550.2,3335.4,78.04,17.962,0.0,7.216,30.162,0.0,0.0,0.685,-0.989,0.0,4.018,0.0,-0.122,32.043,0.0,1.835,0.0,12.137,-10.831,0.0,0.599,1.266,0.0,0.0,-0.039,6.303,0.0,0.828,0.0,-0.112,-1.703,-0.73,-0.191,0.0,2.776,6.626,1610.9,1574.7,9900.4,3489.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house025.xml,108.408,108.408,72.994,72.994,35.414,0.0,0.0,0.0,0.0,0.0,6.241,0.0,1.07,18.728,3.352,14.465,0.0,0.0,9.263,0.0,0.783,0.0,0.0,0.0,0.0,4.105,0.0,0.0,0.447,0.338,2.514,1.528,0.0,2.114,8.046,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.414,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,37.241,48.632,10.555,3.831,0.0,0.0,0.0,0.0,4472.6,7095.2,36.661,33.408,0.0,3.383,17.609,0.0,0.0,2.175,1.445,0.0,6.184,0.0,-1.344,15.156,0.001,0.41,0.0,4.939,-12.781,0.0,1.075,5.64,0.0,0.0,0.437,15.294,0.0,5.824,0.0,-1.337,-0.819,-0.361,-0.005,0.0,6.268,16.892,1610.9,1574.7,4628.0,1631.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house026.xml,56.924,56.924,24.857,24.857,32.067,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.045,0.0,0.0,0.0,0.0,0.0,6.534,0.251,0.548,0.299,0.0,0.0,0.0,1.987,0.0,0.0,0.447,0.338,2.514,1.528,0.934,2.114,7.317,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,17.945,0.0,14.123,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,13.746,0.0,8.606,2.06,0.0,0.0,0.0,0.0,1553.6,0.0,17.087,0.0,0.0,1.774,6.783,0.232,0.0,0.197,1.964,0.0,6.552,0.0,-0.067,2.893,0.0,3.129,0.0,0.0,-9.807,0.0,-0.068,-4.124,-0.142,0.0,-0.149,2.263,0.0,-1.468,0.0,-0.056,-1.798,-4.401,-2.684,0.0,0.0,12.855,1346.7,1333.5,8859.0,3122.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house027.xml,72.167,72.167,31.82,31.82,40.348,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.422,7.51,1.481,0.0,0.0,0.0,5.947,0.218,0.485,0.927,0.0,0.0,0.0,1.724,0.0,0.0,0.447,0.338,2.514,0.105,0.0,2.114,7.587,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.387,0.0,17.892,0.0,3.069,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,18.261,22.701,8.564,5.239,0.0,0.0,0.0,0.0,1574.7,3751.3,23.307,23.273,0.719,1.783,7.862,0.434,0.0,0.59,1.209,0.0,0.361,2.849,-0.176,1.747,0.0,10.441,0.0,1.978,-11.64,0.493,1.132,0.821,0.096,0.0,-0.102,5.393,0.0,0.118,4.052,-0.145,-0.349,-2.029,-3.382,0.0,2.692,13.83,1610.9,1574.7,10579.6,3728.4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -394,7 +394,7 @@ house033.xml,123.825,123.825,17.726,17.726,0.0,106.098,0.0,0.0,0.0,0.0,0.0,0.0,0 house034.xml,151.862,151.862,43.565,43.565,0.0,0.0,108.298,0.0,0.0,0.0,0.0,0.0,0.079,0.0,0.0,0.0,0.0,0.0,16.498,0.341,1.204,0.0,0.0,0.0,0.0,1.909,0.0,0.0,0.528,0.39,2.899,1.661,0.0,2.35,15.707,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,85.919,0.0,22.379,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,60.739,0.0,12.369,5.449,0.0,0.0,0.0,0.0,2971.8,0.0,85.274,0.0,0.0,8.935,27.151,0.0,2.682,1.911,-0.764,0.0,10.238,2.028,0.022,34.894,0.0,0.574,0.0,0.0,-26.786,0.0,-1.747,-6.758,0.0,0.064,-0.446,18.814,0.0,-2.086,-3.461,0.113,-8.25,-11.625,-0.18,0.0,0.0,15.868,1857.7,1859.4,11100.3,3616.2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house035.xml,71.382,71.382,18.569,18.569,52.813,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.745,1.724,0.116,0.0,0.0,0.0,5.438,0.0,0.533,0.0,0.0,0.0,0.0,2.257,0.0,0.0,0.447,0.338,0.199,0.105,0.0,2.114,4.553,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,29.955,0.0,17.146,2.642,3.069,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.598,2.659,9.967,3.82,0.0,0.0,97.0,0.0,1407.0,1998.2,38.188,10.163,0.373,6.249,11.058,0.0,0.0,0.546,-1.477,0.0,5.829,0.0,-0.011,13.695,0.0,0.494,0.0,0.0,-11.957,0.06,-0.577,-1.578,0.0,0.0,-0.082,6.112,0.0,-3.812,0.0,0.01,-2.684,-1.838,-0.125,0.0,0.0,7.338,1610.9,1574.7,11176.7,3938.8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house036.xml,79.027,79.027,26.172,26.172,52.856,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.875,6.052,1.068,0.0,0.0,0.0,5.449,0.0,0.536,0.0,0.0,0.0,0.0,1.617,0.0,0.0,0.366,0.286,2.129,1.395,0.0,1.879,4.519,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.212,0.0,17.644,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,28.939,15.312,8.412,5.785,0.0,0.0,98.0,126.0,1454.2,3248.1,30.306,17.606,5.638,2.3,4.054,0.0,0.0,1.85,-1.08,0.0,18.035,0.0,-0.016,7.427,0.0,0.556,0.0,0.0,-9.824,1.552,0.111,-0.049,0.0,0.0,-0.233,6.097,0.0,3.132,0.0,-0.002,-0.759,-0.989,-0.062,0.0,0.0,6.428,1364.1,1290.1,6619.3,2525.8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -house037.xml,87.547,87.547,22.723,22.723,0.0,64.825,0.0,0.0,0.0,0.0,0.0,0.0,0.157,0.0,0.0,0.0,0.0,0.0,6.807,0.0,0.61,0.0,0.0,0.0,0.0,2.004,0.0,0.0,0.447,0.338,2.514,1.528,0.0,2.114,6.203,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,44.142,0.0,20.683,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,32.599,0.0,9.51,0.0,0.0,0.0,0.0,0.0,1515.0,0.0,27.744,0.0,0.0,13.174,11.523,0.0,0.0,1.58,-3.051,0.0,5.214,0.0,-0.255,14.707,0.0,0.461,0.0,0.0,-10.75,0.0,0.286,-3.607,0.0,0.0,-0.685,11.204,0.0,-4.24,0.0,-0.243,-4.693,-6.077,-0.207,0.0,0.0,8.96,1610.9,1574.7,11016.6,3882.4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +house037.xml,91.488,91.488,22.737,22.737,0.0,68.751,0.0,0.0,0.0,0.0,0.0,0.0,0.172,0.0,0.0,0.0,0.0,0.0,6.807,0.0,0.61,0.0,0.0,0.0,0.0,2.004,0.0,0.0,0.447,0.338,2.514,1.528,0.0,2.114,6.203,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,48.068,0.0,20.683,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.595,0.0,9.51,0.0,0.0,0.0,0.0,0.0,1517.0,0.0,29.156,0.0,0.0,16.84,11.416,0.0,0.0,1.573,-3.149,0.0,4.945,0.0,-0.325,14.719,0.0,0.461,0.0,0.0,-10.838,0.0,-2.774,-2.935,0.0,0.0,-0.607,11.633,0.0,-3.698,0.0,-0.314,-4.156,-5.261,-0.189,0.0,0.0,8.872,1610.9,1574.7,11016.6,3882.4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house038.xml,127.639,127.639,52.467,52.467,75.172,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.896,13.845,2.89,0.0,0.0,0.0,6.908,0.315,0.625,0.0,0.0,0.0,0.0,1.603,0.0,0.0,0.689,0.493,3.669,1.927,0.0,2.82,6.085,0.0,0.0,0.0,9.699,0.0,0.0,0.0,0.0,49.452,0.0,25.721,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,39.441,31.743,16.074,4.6,0.0,0.0,0.0,236.0,2508.2,5703.9,48.112,27.46,0.0,3.657,14.889,0.651,4.405,0.808,1.555,0.0,1.729,2.284,-0.048,22.419,0.0,0.593,0.0,0.0,-14.007,0.0,0.831,2.533,0.138,2.217,0.013,14.615,0.0,0.375,-0.604,-0.033,-0.636,-0.321,0.003,0.0,0.0,11.876,2351.3,2428.6,16182.3,4593.4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house039.xml,96.76,96.76,20.921,20.921,75.839,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.147,0.0,0.0,3.774,0.0,0.0,4.411,0.239,0.418,0.0,0.0,0.0,0.0,1.763,0.0,0.0,0.447,0.338,2.514,0.105,0.0,2.114,4.652,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,72.77,0.0,0.0,0.0,3.069,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,46.382,0.0,9.905,1.144,0.0,0.0,0.0,0.0,1574.3,0.0,52.31,0.0,0.0,14.387,5.445,0.0,0.0,2.532,1.971,0.0,12.371,0.0,-0.051,16.998,0.0,0.559,0.0,0.0,-8.231,0.0,-1.912,-1.149,0.0,0.0,-0.722,8.077,0.0,-2.973,0.0,-0.034,-3.334,-3.351,-0.16,0.0,0.0,5.859,1610.9,1574.7,11662.0,4109.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 house040.xml,104.02,104.02,24.456,24.456,79.564,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.274,0.0,0.0,0.0,0.0,0.0,7.373,0.0,0.651,0.0,0.0,0.0,0.0,1.603,0.0,0.0,0.447,0.338,2.514,1.528,0.0,2.114,6.613,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,59.309,0.0,20.255,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,55.874,0.0,10.233,5.531,0.0,0.0,0.0,0.0,1807.8,0.0,61.913,0.0,11.309,5.643,22.369,0.0,4.098,2.102,-0.199,0.0,1.991,2.894,-0.118,19.751,0.0,0.613,0.0,0.0,-15.012,0.435,-0.635,-4.554,0.0,0.16,-0.554,8.402,0.0,0.042,-3.489,-0.064,-3.799,-4.461,-0.168,0.0,0.0,8.85,1610.9,1574.7,9674.8,3409.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/workflow/tests/base_results/results_bills.csv b/workflow/tests/base_results/results_bills.csv index b735d198ac..ed54bcc074 100644 --- a/workflow/tests/base_results/results_bills.csv +++ b/workflow/tests/base_results/results_bills.csv @@ -373,15 +373,15 @@ house012.xml,1225.02,144.0,1081.02,0.0,1225.02,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 house013.xml,1076.66,144.0,932.66,0.0,1076.66,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 house014.xml,1104.3,144.0,960.3,0.0,1104.3,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 house015.xml,1076.66,144.0,932.66,0.0,1076.66,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -house016.xml,2539.62,144.0,1656.03,0.0,1800.03,0.0,0.0,0.0,0.0,739.59,0.0,0.0,0.0 +house016.xml,2538.31,144.0,1646.16,0.0,1790.16,0.0,0.0,0.0,0.0,748.15,0.0,0.0,0.0 house017.xml,1873.39,144.0,929.46,0.0,1073.46,144.0,655.93,799.93,0.0,0.0,0.0,0.0,0.0 house018.xml,1811.43,144.0,1667.43,0.0,1811.43,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 house019.xml,2926.06,144.0,1820.24,0.0,1964.24,144.0,817.82,961.82,0.0,0.0,0.0,0.0,0.0 house020.xml,4747.91,144.0,2405.65,0.0,2549.65,0.0,0.0,0.0,0.0,2198.26,0.0,0.0,0.0 -house021.xml,3011.45,144.0,1601.61,0.0,1745.61,144.0,1121.84,1265.84,0.0,0.0,0.0,0.0,0.0 +house021.xml,3010.11,144.0,1585.19,0.0,1729.19,144.0,1136.92,1280.92,0.0,0.0,0.0,0.0,0.0 house022.xml,3926.03,144.0,1558.42,0.0,1702.42,0.0,0.0,0.0,2223.61,0.0,0.0,0.0,0.0 -house023.xml,3927.52,144.0,1951.2,0.0,2095.2,0.0,0.0,0.0,1832.32,0.0,0.0,0.0,0.0 -house024.xml,3736.09,144.0,1266.74,0.0,1410.74,0.0,0.0,0.0,2325.35,0.0,0.0,0.0,0.0 +house023.xml,3955.02,144.0,1939.14,0.0,2083.14,0.0,0.0,0.0,1871.88,0.0,0.0,0.0,0.0 +house024.xml,3789.17,144.0,1252.39,0.0,1396.39,0.0,0.0,0.0,2392.78,0.0,0.0,0.0,0.0 house025.xml,2912.92,144.0,2230.93,0.0,2374.93,144.0,393.99,537.99,0.0,0.0,0.0,0.0,0.0 house026.xml,1404.46,144.0,759.7,0.0,903.7,144.0,356.76,500.76,0.0,0.0,0.0,0.0,0.0 house027.xml,1709.39,144.0,972.51,0.0,1116.51,144.0,448.88,592.88,0.0,0.0,0.0,0.0,0.0 @@ -394,7 +394,7 @@ house033.xml,3468.12,144.0,586.32,0.0,730.32,0.0,0.0,0.0,2737.8,0.0,0.0,0.0,0.0 house034.xml,5479.79,144.0,1440.96,0.0,1584.96,0.0,0.0,0.0,0.0,3894.83,0.0,0.0,0.0 house035.xml,1464.29,144.0,614.21,0.0,758.21,144.0,562.08,706.08,0.0,0.0,0.0,0.0,0.0 house036.xml,1716.2,144.0,865.66,0.0,1009.66,144.0,562.54,706.54,0.0,0.0,0.0,0.0,0.0 -house037.xml,2794.5,144.0,977.74,0.0,1121.74,0.0,0.0,0.0,1672.76,0.0,0.0,0.0,0.0 +house037.xml,2896.45,144.0,978.38,0.0,1122.38,0.0,0.0,0.0,1774.07,0.0,0.0,0.0,0.0 house038.xml,2823.47,144.0,1735.41,0.0,1879.41,144.0,800.06,944.06,0.0,0.0,0.0,0.0,0.0 house039.xml,1787.16,144.0,692.01,0.0,836.01,144.0,807.15,951.15,0.0,0.0,0.0,0.0,0.0 house040.xml,1943.7,144.0,808.9,0.0,952.9,144.0,846.8,990.8,0.0,0.0,0.0,0.0,0.0