From 4f6398e819f1d5b59e11e891cd3f91f7ee292eae Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 24 Mar 2022 13:55:03 +0100
Subject: [PATCH] Replaced "long range" by "long-range"

---
 README.md                                     |  2 +-
 cara/apps/calculator/report_generator.py      |  2 +-
 cara/apps/calculator/static/js/report.js      |  4 ++--
 .../templates/base/calculator.form.html.j2    |  2 +-
 .../templates/base/calculator.report.html.j2  |  2 +-
 cara/models.py                                | 24 +++++++++----------
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 57179d2b..90319c63 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ _Note that the short-range component of the model has not yet been published._
 
 ### COVID Calculator
 
-A risk assessment tool which simulates the long range airborne spread of the SARS-CoV-2 virus for space managers.
+A risk assessment tool which simulates the long-range airborne spread of the SARS-CoV-2 virus for space managers.
 
 
 ### CARA Expert App
diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py
index a995900d..07d560c0 100644
--- a/cara/apps/calculator/report_generator.py
+++ b/cara/apps/calculator/report_generator.py
@@ -110,7 +110,7 @@ def concentrations_with_sr_breathing(model: models.ExposureModel, times: typing.
     lower_concentrations = []
     for time in times:
         for index, (start, stop) in enumerate(short_range_intervals):
-            # For visualization issues, add short-range breathing activity to the initial long range concentrations
+            # For visualization issues, add short-range breathing activity to the initial long-range concentrations
             if start <= time <= stop and short_range_activities[index] == 'Breathing':
                 lower_concentrations.append(np.array(model.concentration(float(time))).mean())
                 break
diff --git a/cara/apps/calculator/static/js/report.js b/cara/apps/calculator/static/js/report.js
index 5ad8375b..b8511804 100644
--- a/cara/apps/calculator/static/js/report.js
+++ b/cara/apps/calculator/static/js/report.js
@@ -158,7 +158,7 @@ function draw_plot(svg_id) {
         .style("stroke-dasharray", "5 5")
         .attr('fill', 'none');
 
-    // Line representing the long range cumulative concentration.
+    // Line representing the long-range cumulative concentration.
     if (show_sr_legend) {
         var longRangeCumulative = d3.line();
         var draw_long_range_cumulative_line = draw_area.append('svg:path')
@@ -252,7 +252,7 @@ function draw_plot(svg_id) {
             .duration(1000)
             .attr("d", lineCumulative(data_for_graphs.cumulative_doses));
     
-        // Long range cumulative line.
+        // Long-range cumulative line.
         if (show_sr_legend) {
             longRangeCumulative.defined(d => !isNaN(d.concentration))
                 .x(d => xTimeRange(d.time))
diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2
index 04ffb455..de9716eb 100644
--- a/cara/apps/templates/base/calculator.form.html.j2
+++ b/cara/apps/templates/base/calculator.form.html.j2
@@ -555,7 +555,7 @@
 
 <div class="container container--padding">
   <b>Quick Guide:</b><br>
-  This tool simulates the long range airborne spread SARS-CoV-2 virus in a finite volume and estimates the risk of COVID-19 infection. It is based on current scientific data and can be used to compare the effectiveness of different mitigation measures.<br>
+  This tool simulates the long-range airborne spread SARS-CoV-2 virus in a finite volume and estimates the risk of COVID-19 infection. It is based on current scientific data and can be used to compare the effectiveness of different mitigation measures.<br>
   <b>Virus data:</b> <br>
   SARS-CoV-2 covers the original "wild type" strain of the virus and three variants of concern (VOC):<br>
   <ul>
diff --git a/cara/apps/templates/base/calculator.report.html.j2 b/cara/apps/templates/base/calculator.report.html.j2
index b0eddfb8..e11456cb 100644
--- a/cara/apps/templates/base/calculator.report.html.j2
+++ b/cara/apps/templates/base/calculator.report.html.j2
@@ -94,7 +94,7 @@
 										<button class="btn btn-sm btn-primary" id="button_full_exposure" disabled>Show full exposure</button>
 										<button class="btn btn-sm btn-primary ml-0" id="button_hide_high_concentration">Hide high concentration</button>
 									{% endif %}
-									<input type="checkbox" id="long_range_cumulative_checkbox"><label class="form-check-label ml-1" for="long_range_cumulative_checkbox" id="lr_cumulative_checkbox_label">Show doses from long range exposure alone</label>
+									<input type="checkbox" id="long_range_cumulative_checkbox"><label class="form-check-label ml-1" for="long_range_cumulative_checkbox" id="lr_cumulative_checkbox_label">Show doses from long-range exposure alone</label>
 								{% endif %}
 								<div id="concentration_plot" style="height: 400px"></div>
 								<script type="application/javascript">
diff --git a/cara/models.py b/cara/models.py
index e1cc343a..5b7a1e1d 100644
--- a/cara/models.py
+++ b/cara/models.py
@@ -1000,7 +1000,7 @@ class ConcentrationModel:
 
     def _normed_concentration(self, time: float) -> _VectorisedFloat:
         """
-        Virus long range exposure concentration, as a function of time, and
+        Virus long-range exposure concentration, as a function of time, and
         normalized by the emission rate.
         The formulas used here assume that all parameters (ventilation,
         emission rate) are constant between two state changes - only
@@ -1026,7 +1026,7 @@ class ConcentrationModel:
 
     def concentration(self, time: float) -> _VectorisedFloat:
         """
-        Virus long range exposure concentration, as a function of time.
+        Virus long-range exposure concentration, as a function of time.
 
         Note that time is not vectorised. You can only pass a single float
         to this method.
@@ -1037,7 +1037,7 @@ class ConcentrationModel:
     @method_cache
     def normed_integrated_concentration(self, start: float, stop: float) -> _VectorisedFloat:
         """
-        Get the integrated long range concentration of viruses in the air  between the times start and stop,
+        Get the integrated long-range concentration of viruses in the air  between the times start and stop,
         normalized by the emission rate.
         """
         if stop <= self._first_presence_time():
@@ -1097,16 +1097,16 @@ class ShortRangeModel:
             if start < time <= stop:
                 dilution = self.dilutions[index]
                 jet_origin_concentration = self.expirations[index].jet_origin_concentration()
-                # Long range concentration normalized by the virus viral load
+                # Long-range concentration normalized by the virus viral load
                 long_range_normed_concentration = concentration_model.concentration(time) / concentration_model.virus.viral_load_in_sputum
                 
-                # The long range concentration values are then approximated using interpolation:
+                # The long-range concentration values are then approximated using interpolation:
                 # The set of points where we want the interpolated values are the short-range particle diameters (given the current expiration); 
-                # The set of points with a known value are the long range particle diameters (given the initial expiration);
-                # The set of known values are the long range concentration values normalized by the viral load.
+                # The set of points with a known value are the long-range particle diameters (given the initial expiration);
+                # The set of known values are the long-range concentration values normalized by the viral load.
                 long_range_normed_concentration_interpolated=np.interp(self.expirations[index].particle.diameter, concentration_model.infected.particle.diameter, long_range_normed_concentration)
                 
-                # Short-range concentration formula. The long range concentration is added in the concentration method (ExposureModel).
+                # Short-range concentration formula. The long-range concentration is added in the concentration method (ExposureModel).
                 return ((1/dilution)*(jet_origin_concentration - long_range_normed_concentration_interpolated))
         
         return 0.
@@ -1206,7 +1206,7 @@ class ExposureModel:
         """
         Virus exposure concentration, as a function of time.
 
-        It considers the long range concentration with the
+        It considers the long-range concentration with the
         contribution of the short-range concentration.
         """        
         return (self.concentration_model.concentration(time) + 
@@ -1249,9 +1249,9 @@ class ExposureModel:
         The number of virus per m^3 deposited on the respiratory tract
         between any two times.
 
-        Considers a contribution between the short-range and long range exposures:
+        Considers a contribution between the short-range and long-range exposures:
         It calculates the deposited exposure given a short-range interaction (if any).
-        Then, the deposited exposure given the long range interactions is added to the
+        Then, the deposited exposure given the long-range interactions is added to the
         initial deposited exposure. 
         """
         deposited_exposure = 0.
@@ -1289,7 +1289,7 @@ class ExposureModel:
         
         # then we multiply by the diameter-independent quantity virus viral load
         deposited_exposure *= self.concentration_model.virus.viral_load_in_sputum
-        # long range concentration
+        # long-range concentration
         f_inf = self.concentration_model.infected.fraction_of_infectious_virus()
         deposited_exposure += self.long_range_deposited_exposure_between_bounds(time1, time2)/f_inf