From 12638bf8a6f2dd5cf2930a80508191cca54dcfc6 Mon Sep 17 00:00:00 2001 From: "d.neuroth" Date: Mon, 12 Dec 2022 18:02:36 +0100 Subject: [PATCH 1/2] added reference to JOSS paper to the readme and the welcome page --- WpfApplication1/Views/SpecialViews/WelcomeView.xaml | 11 +++++++++++ .../Views/SpecialViews/WelcomeView.xaml.cs | 2 +- readme.md | 13 ++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/WpfApplication1/Views/SpecialViews/WelcomeView.xaml b/WpfApplication1/Views/SpecialViews/WelcomeView.xaml index c1307173..1d094a47 100644 --- a/WpfApplication1/Views/SpecialViews/WelcomeView.xaml +++ b/WpfApplication1/Views/SpecialViews/WelcomeView.xaml @@ -60,6 +60,17 @@ , in the second part of the author's PhD thesis. + If you want to use the Load Profile Generator for a publication, please cite the following paper: + + Pflugradt et al., (2022). LoadProfileGenerator: An Agent-Based Behavior Simulation for Generating Residential Load Profiles. Journal of Open Source Software, 7(71), 3574, + + https://doi.org/10.21105/joss.03574 + + + If you are looking for the quickest way to a load profile, select "Calculation" on the left, fill in a target path and click on the button "calculate!". diff --git a/WpfApplication1/Views/SpecialViews/WelcomeView.xaml.cs b/WpfApplication1/Views/SpecialViews/WelcomeView.xaml.cs index fd1956d0..26b8b27f 100644 --- a/WpfApplication1/Views/SpecialViews/WelcomeView.xaml.cs +++ b/WpfApplication1/Views/SpecialViews/WelcomeView.xaml.cs @@ -59,7 +59,7 @@ private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation. System.Diagnostics.Process.Start(psInfo); } catch (System.Exception) { - Common.Logger.Error("Could not open the link to the manual: " + e.Uri.ToString()); + Common.Logger.Error("Could not open the following link: " + e.Uri.ToString()); } } } diff --git a/readme.md b/readme.md index a4c3d294..f29afc95 100644 --- a/readme.md +++ b/readme.md @@ -27,6 +27,13 @@ Copyright (c) 2010-2022 Noah Pflugradt (FZJ IEK-3), Peter Stenzel (FZJ IEK-3), You should have received a copy of the MIT License along with this program. If not, see +## Citation + +If you want to use the LoadProfileGenerator for a publication, please cite the following paper: +``` +Pflugradt et al., (2022). LoadProfileGenerator: An Agent-Based Behavior Simulation for Generating Residential Load Profiles. Journal of Open Source Software, 7(71), 3574, https://doi.org/10.21105/joss.03574 +``` + ## External Data The LoadProfileGenerator uses solar radiation profiles from Deutscher Wetterdienst (DWD, www.dwd.de) and from Photovoltaic Geographical Information System (PVGIS, https://ec.europa.eu/jrc/en/pvgis) @@ -43,11 +50,11 @@ We are the Institute of Energy This software was first developed at -__Technische Universit�t Chemnitz - Professur Technische Thermodynamik__ +__Technische Universität Chemnitz - Professur Technische Thermodynamik__ ### 2016-2020 -__Berner Fachhochschule - Labor f�r Photovoltaik-Systeme__ +__Berner Fachhochschule - Labor für Photovoltaik-Systeme__ Part of the Development was funded by the @@ -55,7 +62,7 @@ __Swiss Federal Office of Energy__ ## Starting March 2020 -Currently development is funded by the Forschungszentrum J�lich - IEK 3. +Currently development is funded by the Forschungszentrum Jülich - IEK 3. FZJ Logo From bf8b000148581064bd5ac3036f66aaddf8ed95cd Mon Sep 17 00:00:00 2001 From: "d.neuroth" Date: Tue, 13 Dec 2022 00:03:43 +0100 Subject: [PATCH 2/2] Bugfix: now uses a single location guid for all persons --- CalculationEngine/HouseholdElements/CalcPerson.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CalculationEngine/HouseholdElements/CalcPerson.cs b/CalculationEngine/HouseholdElements/CalcPerson.cs index 971d9096..8b2dcc9b 100644 --- a/CalculationEngine/HouseholdElements/CalcPerson.cs +++ b/CalculationEngine/HouseholdElements/CalcPerson.cs @@ -96,12 +96,12 @@ public CalcPerson([JetBrains.Annotations.NotNull] CalcPersonDto calcPerson, IsOnVacation = isOnVacation; CurrentLocation = startingLocation; _vacationAffordanceGuid = System.Guid.NewGuid().ToStrGuid(); - _vacationLocationGuid = System.Guid.NewGuid().ToStrGuid(); } //guid for all vacations of this person private readonly StrGuid _vacationAffordanceGuid; - private readonly StrGuid _vacationLocationGuid; + // use one vacation location guid for all persons + private static readonly StrGuid _vacationLocationGuid = System.Guid.NewGuid().ToStrGuid(); [JetBrains.Annotations.NotNull] private CalcLocation CurrentLocation { get; set; }