Merge pull request #30 from FZJ-IEK3-VSA/develop

Final changes for v10.9.0
FZJ-IEK3-VSA · Dec 14, 2022 · 108d56f · 108d56f
2 parents b03cd38 + bf8b000
commit 108d56f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git 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; }
 

diff --git a/WpfApplication1/Views/SpecialViews/WelcomeView.xaml b/WpfApplication1/Views/SpecialViews/WelcomeView.xaml
@@ -60,6 +60,17 @@
                 </Hyperlink>, in the second part of the author's PhD thesis.
                 <LineBreak />
                 <LineBreak />
+                If you want to use the Load Profile Generator for a publication, please cite the following paper:
+                <LineBreak />
+                Pflugradt et al., (2022). LoadProfileGenerator: An Agent-Based Behavior Simulation for Generating Residential Load Profiles. Journal of Open Source Software, 7(71), 3574, 
+                <Hyperlink
+                    Name="LinkToJOSSPaper"
+                    NavigateUri="https://doi.org/10.21105/joss.03574"
+                    RequestNavigate="Hyperlink_RequestNavigate">
+                    https://doi.org/10.21105/joss.03574
+                </Hyperlink>
+                <LineBreak />
+                <LineBreak />
                 If you are looking for the quickest way to a load profile, select &quot;Calculation&quot; on the left,
                 fill in a target path and click on the button &quot;calculate!&quot;.
                 <LineBreak />

diff --git 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
@@ -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 <https://opensource.org/licenses/MIT>
 
+## 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,19 +50,19 @@ We are the <a href="https://www.fz-juelich.de/en/iek/iek-3">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 
 
 __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.
 
 <a href="https://www.fz-juelich.de/en/iek/iek-3"><img src="https://raw.githubusercontent.com/OfficialCodexplosive/README_Assets/862a93188b61ab4dd0eebde3ab5daad636e129d5/FJZ_IEK-3_logo.svg" alt="FZJ Logo" width="300px"></a>