misc

Author: I800461

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

@@ -507,7 +507,10 @@ private HalfYearEntries<HalfYearEntry> evalHalves(
         evalHalves_with_births(halves, curr, p_mid1941, immigration_halves);
 
         /* сгладить число рождений по времени, сделав непрерывным */
-        new SmoothBirths().init_nonwar(ap, halves).calc();
+        new SmoothBirths().init_nonwar(ap, halves).calc().to_nonwar(halves);
+
+        /* остальные полугодия: с рождениями, конечный расчёт их числа */
+        evalHalves_with_births(halves, curr, p_mid1941, immigration_halves);
 
         /*
          * Дополнительные данные для полугодий
@@ -632,7 +635,16 @@ private void evalHalves_with_births(
 
             /* передвижка на следующие полгода населения с учётом рождений */
             ForwardPopulationT f_wb = new ForwardPopulationT();
-            f_wb.setBirthRateTotal(ap.CBR_1940);
+            if (prev.expected_nonwar_births_byday != null)
+            {
+                double[] m_births = WarHelpers.male_births(prev.expected_nonwar_births_byday);
+                double[] f_births = WarHelpers.female_births(prev.expected_nonwar_births_byday);
+                f_wb.setBirthCount(m_births, f_births);
+            }
+            else
+            {
+                f_wb.setBirthRateTotal(ap.CBR_1940);
+            }
             f_wb.forward(pwb, prev.peace_mt, 0.5);
             if (immigration != null)
                 pwb = pwb.add(immigration, ValueConstraint.NON_NEGATIVE);
@@ -1198,6 +1210,7 @@ private void evalDeathsForNewBirths_UnderPeacetimeChildMortality() throws Except
             int ndays = fw.birthDays(0.5);
 
             // добавить фактические рождения, распределив их по дням
+            // ###
             double nb1 = he.prev.actual_births;
             double nb2 = he.actual_births;
             double nb3 = (he.next != null) ? he.next.actual_births : nb2;
@@ -1282,6 +1295,7 @@ private double fitDeathsForNewBirths(double multiplier, boolean record) throws E
             double nb1 = he.prev.actual_births;
             double nb2 = he.actual_births;
             double nb3 = (he.next != null) ? he.next.actual_births : nb2;
+            // ###
             double[] births = WarHelpers.births(ndays, nb1, nb2, nb3);
             double[] m_births = WarHelpers.male_births(births);
             double[] f_births = WarHelpers.female_births(births);

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

@@ -24,6 +24,7 @@ public class SmoothBirths
     private AreaParameters ap;
     private List<Bin> bins;
     private double[] births_1941_1st_halfyear;
+    private double[] births;
 
     public SmoothBirths init_nonwar(AreaParameters ap, HalfYearEntries<HalfYearEntry> halves) throws Exception
     {
@@ -71,7 +72,7 @@ public SmoothBirths init_actual(AreaParameters ap, HalfYearEntries<HalfYearEntry
         return this;
     }
 
-    public void calc() throws Exception
+    public SmoothBirths calc() throws Exception
     {
         Bin[] abins = Bins.bins(bins);
         double[] averages = Bins.midpoint_y(abins);
@@ -84,21 +85,43 @@ public void calc() throws Exception
 
         abins[0].avg = averages[0] = Util.average(births_1941_1st_halfyear);
 
-        double[] births = DisaggregateVariableWidthSeriesWithStartValues.disaggregate(averages,
-                                                                              intervalWidths,
-                                                                              maxIterations,
-                                                                              smoothingSigma,
-                                                                              positivityThreshold,
-                                                                              maxConvergenceDifference,
-                                                                              births_1941_1st_halfyear);
+        births = DisaggregateVariableWidthSeriesWithStartValues.disaggregate(averages,
+                                                                             intervalWidths,
+                                                                             maxIterations,
+                                                                             smoothingSigma,
+                                                                             positivityThreshold,
+                                                                             maxConvergenceDifference,
+                                                                             births_1941_1st_halfyear);
 
         if (!Util.isNonNegative(births))
             throw new Exception("Error calculating curve (negative value)");
 
         CurveVerifier.validate_means(births, abins);
 
-        new ChartXY("Рождения " + ap.area, "x", "y")
-                .addSeries("b1", births)
-                .display();
+        if (Util.False)
+        {
+            new ChartXY("Рождения " + ap.area, "x", "y")
+                    .addSeries("b1", births)
+                    .display();
+        }
+        
+        return this;
+    }
+    
+    public void to_nonwar(HalfYearEntries<HalfYearEntry> halves)
+    {
+        int nd = 0;
+
+        for (HalfYearEntry he : halves)
+        {
+            if (he.next == null)
+                break;
+            
+            he.expected_nonwar_births_byday = Util.splice(births, nd, nd + ndays - 1);
+
+            nd += ndays;
+        }
+        
+        Util.assertion(nd == births.length);
     }
 }

ww2-losses/src/main/java/rtss/ww2losses/population1941/PopulationMiddle1941.java

@@ -68,8 +68,6 @@ public PopulationForwardingResult1941 forward_1941_1st_halfyear(
              * Не пытаясь реконструировать кривую хода числа рождений в первом полугодии 1941 года, 
              * мы приближаем её плоской линией.
              */
-            
-            // double[] births = WarHelpers.births(ndays, nbirths, nbirths, nbirths);
             double[] births = Util.normalize(Util.repeat(ndays, 1), nbirths);
             double[] m_births = WarHelpers.male_births(births);
             double[] f_births = WarHelpers.female_births(births);