set daughter critVol from birth volume in GMC differentiation

Author: Jannetty

src/arcade/potts/agent/cell/PottsCellFlyGMC.java

@@ -55,6 +55,41 @@ public PottsCellContainer make(int newID, CellState newState, MersenneTwisterFas
                 criticalRegionHeights);
     }
 
+    /**
+     * Creates a container for a new daughter cell with an explicit critical volume.
+     *
+     * <p>Unlike {@link #make(int, CellState, MersenneTwisterFast)}, which copies this cell's
+     * critical volume, this overload lets the caller set the daughter's critical volume from the
+     * volume it is actually born into rather than inheriting the parent's.
+     *
+     * @param newID the daughter cell ID
+     * @param newState the daughter cell state
+     * @param critVol the critical volume assigned to the daughter cell
+     * @param random the random number generator
+     * @return a container for the daughter cell
+     */
+    public PottsCellContainer make(
+            int newID, CellState newState, double critVol, MersenneTwisterFast random) {
+        divisions++;
+
+        int newPop = links.next(random);
+
+        return new PottsCellContainer(
+                newID,
+                id,
+                newPop,
+                age,
+                divisions,
+                newState,
+                null,
+                0,
+                null,
+                critVol,
+                criticalHeight,
+                criticalRegionVolumes,
+                criticalRegionHeights);
+    }
+
     @Override
     void setStateModule(CellState newState) {
         switch ((State) newState) {

src/arcade/potts/agent/module/PottsModuleFlyGMCDifferentiation.java

@@ -85,7 +85,9 @@ void addCell(MersenneTwisterFast random, Simulation sim) {
 
         // Create and schedule new neuron cell
         int newID = sim.getID();
-        CellContainer newContainer = cell.make(newID, State.QUIESCENT, random);
+        CellContainer newContainer =
+                ((PottsCellFlyGMC) cell)
+                        .make(newID, State.QUIESCENT, newLocation.getVolume(), random);
         PottsCell newCell =
                 (PottsCell) newContainer.convert(sim.getCellFactory(), newLocation, random);
         sim.getGrid().addObject(newCell, null);
@@ -113,7 +115,7 @@ void addCell(MersenneTwisterFast random, Simulation sim) {
                         null,
                         0,
                         null,
-                        oldCell.getCriticalVolume(),
+                        location.getVolume(),
                         oldCell.getCriticalHeight(),
                         oldCell.getCriticalRegionVolumes(),
                         oldCell.getCriticalRegionHeights());

test/arcade/potts/agent/cell/PottsCellFlyGMCTest.java

@@ -125,4 +125,26 @@ public void make_called_returnsCorrectNewContainer() {
                 () -> assertNull(container.criticalRegionVolumes),
                 () -> assertNull(container.criticalRegionHeights));
     }
+
+    @Test
+    public void make_withExplicitCritVol_usesProvidedCritVol() {
+        PottsCellFlyGMC gmc =
+                new PottsCellFlyGMC(baseContainer, locationMock, parametersMock, links);
+        double explicitCritVol = cellCriticalVolume + 50.0;
+        PottsCellContainer container = gmc.make(cellID, State.QUIESCENT, explicitCritVol, random);
+        assertAll(
+                () -> assertNotNull(container),
+                () -> assertEquals(cellID, container.parent),
+                () -> assertEquals(1, container.pop),
+                () -> assertEquals(cellAge, container.age),
+                () -> assertEquals(cellDivisions + 1, container.divisions),
+                () -> assertEquals(State.QUIESCENT, container.state),
+                () -> assertNull(container.phase),
+                () -> assertEquals(0, container.voxels),
+                () -> assertNull(container.regionVoxels),
+                () -> assertEquals(explicitCritVol, container.criticalVolume, EPSILON),
+                () -> assertEquals(cellCriticalHeight, container.criticalHeight, EPSILON),
+                () -> assertNull(container.criticalRegionVolumes),
+                () -> assertNull(container.criticalRegionHeights));
+    }
 }

test/arcade/potts/agent/module/PottsModuleFlyGMCDifferentiationTest.java

@@ -133,10 +133,18 @@ final void tearDown() {
 
     @Test
     public void addCell_called_callsExpectedMethods() {
-        // When the module calls make() on the cell, return Quiescent PottsCellContainer
-        // mock
+        double newLocVol = 42.0;
+        double locVol = 50.0;
+        when(newLocation.getVolume()).thenReturn(newLocVol);
+        when(location.getVolume()).thenReturn(locVol);
+
+        // When the module calls make() on the cell, return Quiescent PottsCellContainer mock
         container = mock(PottsCellContainer.class);
-        when(gmcCell.make(eq(123), eq(State.QUIESCENT), any(MersenneTwisterFast.class)))
+        when(gmcCell.make(
+                        eq(123),
+                        eq(State.QUIESCENT),
+                        eq(newLocVol),
+                        any(MersenneTwisterFast.class)))
                 .thenReturn(container);
         newCell = mock(PottsCell.class);
         when(container.convert(eq(cellFactory), eq(newLocation), any(MersenneTwisterFast.class)))
@@ -147,7 +155,7 @@ public void addCell_called_callsExpectedMethods() {
         module.addCell(random, sim);
         verify(location).split(random);
         verify(gmcCell).reset(dummyIDs, dummyRegions);
-        verify(gmcCell).make(123, State.QUIESCENT, random);
+        verify(gmcCell).make(123, State.QUIESCENT, newLocVol, random);
 
         verify(grid).addObject(newCell, null);
         verify(potts).register(newCell);