misc

Author: I800461

ww2-losses/src/main/java/rtss/ww2losses/Main.java

@@ -32,6 +32,7 @@
 import rtss.ww2losses.helpers.PrintYears;
 import rtss.ww2losses.helpers.ShowAgeSliceDeathHistory;
 import rtss.ww2losses.helpers.ShowPopulationAgeSliceHistory;
+import rtss.ww2losses.helpers.SmoothBirths;
 import rtss.ww2losses.helpers.VerifyHalfYears;
 import rtss.ww2losses.helpers.WarHelpers;
 import rtss.ww2losses.helpers.diag.DiagHelper;
@@ -492,10 +493,15 @@ private HalfYearEntries<HalfYearEntry> evalHalves(
         prev = curr;
         halves.add(curr);
 
-        /* остальные полугодия */
+        /* остальные полугодия: сначала без рождений */
         evalHalves_without_births(halves, curr, p_mid1941, immigration_halves);
+
+        /* остальные полугодия: с рождениями, предварительный расчёт их числа */
         evalHalves_with_births(halves, curr, p_mid1941, immigration_halves);
 
+        /* сгладить число рождений по времени, сделав непрерывным */
+        new SmoothBirths().init(ap, halves).calc();
+
         /*
          * Дополнительные данные для полугодий
          */

ww2-losses/src/main/java/rtss/ww2losses/helpers/SmoothBirths.java

@@ -0,0 +1,58 @@
+package rtss.ww2losses.helpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rtss.data.bin.Bin;
+import rtss.data.bin.Bins;
+import rtss.data.curves.InterpolatePopulationAsMeanPreservingCurve;
+import rtss.data.curves.TargetResolution;
+import rtss.data.curves.InterpolatePopulationAsMeanPreservingCurve.InterpolationOptions;
+import rtss.data.selectors.Gender;
+import rtss.util.plot.ChartXY;
+import rtss.ww2losses.HalfYearEntries;
+import rtss.ww2losses.HalfYearEntry;
+import rtss.ww2losses.params.AreaParameters;
+
+import static rtss.data.population.projection.ForwardPopulation.years2days;
+
+public class SmoothBirths
+{
+    private final int ndays = years2days(0.5);
+    private final double PROMILLE = 1000;
+
+    private AreaParameters ap;
+    private List<Bin> bins;
+
+    public SmoothBirths init(AreaParameters ap, HalfYearEntries<HalfYearEntry> halves) throws Exception
+    {
+        this.ap = ap; 
+        this.bins = new ArrayList<>();
+        int nd = 0;
+
+        for (HalfYearEntry he : halves)
+        {
+            if (he.next == null)
+                break;
+
+            double p1 = he.p_nonwar_with_births.sum();
+            double p2 = he.next.p_nonwar_with_births.sum();
+            double pavg = (p1 + p2) / 2;
+
+            double births = ap.CBR_1940_MIDYEAR * pavg / PROMILLE;
+
+            bins.add(new Bin(nd, nd + ndays - 1, births));
+            nd += ndays;
+        }
+
+        return this;
+    }
+
+    public void calc() throws Exception
+    {
+        InterpolationOptions options = new InterpolationOptions().usePrimaryCSASRA(true).usePrimarySPLINE(false).useSecondaryRefineYearlyAges(false);
+        double[] births = InterpolatePopulationAsMeanPreservingCurve.curve(Bins.bins(bins), "wartime births", TargetResolution.DAILY, 1942, Gender.MALE, options);
+        ChartXY.display("Рождения " + ap.area, births);
+        // ###
+    }
+}