Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
3c5f0f9
change vector getters to use getters, helpful for mocking in tests
Jannetty Oct 17, 2025
cb4815b
changing GMC differentiation module to not be a proliferation module …
Jannetty Oct 17, 2025
d15c8d3
remove shadowing in tests
Jannetty Oct 17, 2025
564525b
fixing imports
Jannetty Oct 17, 2025
0899a19
formatting
Jannetty Oct 17, 2025
651aef5
formatting again
Jannetty Oct 17, 2025
2fbcf15
removed print statements
Jannetty Oct 17, 2025
3f0f860
formatting
Jannetty Oct 17, 2025
0b12f7d
adding ability to determine offset in the frame of the Apical axis in…
Jannetty Oct 20, 2025
d3bd6f6
moving tests into correct place
Jannetty Oct 20, 2025
75382f3
updated test name to reflect function name
Jannetty Oct 20, 2025
df911dc
updating test titles
Jannetty Oct 20, 2025
ba31c85
updating docstring
Jannetty Oct 20, 2025
9a76cf1
formatting
Jannetty Oct 20, 2025
27b07de
changing names of current potts proliferation modules
Jannetty Oct 20, 2025
99af986
Merge branch 'jannetty/update-flygmc-module' into feature/add-phasele…
Jannetty Oct 20, 2025
f200c6f
adding new proliferation module type and changing nomenclature
Jannetty Oct 20, 2025
0ecb30e
changed test filenames appropriately
Jannetty Oct 20, 2025
e1d70a8
formatting
Jannetty Oct 20, 2025
d754aa4
adding period
Jannetty Oct 20, 2025
c1b645b
added PottsModuleProliferation level of abstraction that specifies ad…
Jannetty Oct 21, 2025
78a2492
Merge branch 'feature/add-phaseless-prolifmode' into feature/add-flys…
Jannetty Oct 21, 2025
6695b29
adding missing javadocs
Jannetty Oct 21, 2025
fecaa3f
Merge branch 'feature/add-phaseless-prolifmode' into feature/add-flys…
Jannetty Oct 21, 2025
232d1ae
wip-adding-flystemcellfiles
Jannetty Oct 21, 2025
306c816
making critical volume settable
Jannetty Oct 21, 2025
e90885a
Merge branch 'feature/make-critvol-settable' into feature/add-flystem…
Jannetty Oct 21, 2025
b6d613f
wip adding fly stem proliferation module, fly stem cells, and tests
Jannetty Oct 21, 2025
1935012
moving volume-based growth regulation functions to VolumeBasedDivisio…
Jannetty Oct 21, 2025
ff209db
formatting
Jannetty Oct 21, 2025
1945972
changed visibility of getUniqueIDs, added method relying on getUnique…
Jannetty Oct 22, 2025
6a340dc
moving all parameters so they are read in constructor
Jannetty Oct 22, 2025
4579d71
adding potts parameters to potts parameters xml
Jannetty Oct 22, 2025
7f9461a
formatting
Jannetty Oct 22, 2025
3d04f5d
adding minimum volume for size-dependent critical volume
Jannetty Oct 24, 2025
0b60fc6
adding getOffsetInApicalFrame to PottsLocation
Jannetty Oct 30, 2025
85e008c
removing unnecessary imports
Jannetty Oct 30, 2025
5759730
adding null case to PottsLocation2D docstring
Jannetty Oct 30, 2025
3ac1371
stylecheck
Jannetty Oct 30, 2025
5926510
Merge branch 'feature/add-getoffsetinapicalframe-to-pottslocation2d' …
Jannetty Oct 30, 2025
bc4b7ae
updating function names after merge
Jannetty Oct 30, 2025
ab7281d
add option for deterministic differentiation
Nov 3, 2025
4448c56
add deterministic differentiation param
Nov 3, 2025
e8cfb28
Remove unecessary import
Nov 3, 2025
0a85b7e
Adding boolean flag in the setup file
Nov 3, 2025
eeb551f
added pdelike neuroblast growth (still need to add PDE like GMC growth)
Jannetty Nov 3, 2025
cada3a4
spotlessApply
Nov 4, 2025
10d7c92
adding GMC pde like flag
Jannetty Nov 4, 2025
a59d11f
add test for GMC PDE like behavior
Jannetty Nov 4, 2025
c07c498
updating action-checkstyle as previous version was depreciated
Jannetty Nov 4, 2025
173ce0f
relax 100 character to warning from error
Jannetty Nov 4, 2025
c9390fe
restoring github actions to previous state:
Jannetty Nov 4, 2025
b012523
adjust tests
Jannetty Nov 4, 2025
e3d7193
removing setup file:
Jannetty Nov 4, 2025
245d413
making daughterStemDeterministic compare normalVector to expected mud…
Jannetty Nov 4, 2025
2517263
Merge branch 'feature/add-flystemcells-daughterstem' into feature/add…
Jannetty Nov 4, 2025
03177ba
trying to update linter
Jannetty Nov 5, 2025
816b50e
wip
Jannetty Nov 5, 2025
5ccaf59
updating remote for running setup files
Jannetty Jan 28, 2026
f119e36
removing emojis
Jannetty Feb 4, 2026
3a38a30
updating gradle so breakpoints work in intellij, adding setupfiles
Jannetty Feb 5, 2026
98ed7ae
updated updateGrowthRateBasedOnOtherNBs
Jannetty Feb 25, 2026
7554ac4
last gradle update
Jannetty Mar 2, 2026
7391972
changing build.gradle sourceCompatibility (restoring to what is on main)
Jannetty Mar 2, 2026
f16f435
changing test to appropriately count NB neighbors
Jannetty Mar 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/config/checks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@
<property name="id" value="LineLength"/>
<property name="fileExtensions" value="java" />
<property name="max" value="100"/>
<property name="severity" value="warning"/>
</module>
<module name="LineLength">
<property name="id" value="LineLengthTest"/>
<property name="fileExtensions" value=".java" />
<property name="max" value="120"/>
<property name="severity" value="error"/>
</module>

<!-- Checks for whitespace -->
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
fetch-depth: 0

- name: Lint code base
uses: dbelyaev/action-checkstyle@v0.9.5
uses: dbelyaev/action-checkstyle@v3.0.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: github-check
checkstyle_config: .github/config/checks.xml
fail_on_error: true
fail_level: error

update-lint-badges:
if: ${{ always() && github.ref == 'refs/heads/main' }}
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ jacocoTestReport {
})
}
reports {
xml.enabled true
html.enabled true
xml.required.set(true)
html.required.set(true)
}
}

Expand Down Expand Up @@ -161,6 +161,8 @@ task updateVersion (group: "versioning", description: "Syncs gradle version with

build.dependsOn copyJar

copyJar.mustRunAfter check, jacocoTestReport

test.finalizedBy jacocoTestReport

bumpMajor.finalizedBy updateVersion
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
206 changes: 103 additions & 103 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions setup/gmc.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<set prefix="2024-10-25-04">

Check failure on line 1 in setup/gmc.xml

View workflow job for this annotation

GitHub Actions / checkstyle

[checkstyle] setup/gmc.xml#L1 <com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck>

File does not end with a newline.
Raw output
/github/workspace/./setup/gmc.xml:1:0: error: File does not end with a newline. (com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck)
<series name="dd" start="1" end="1"
ds=".3" margin="0" height="1" length="302" width="302"
dt=".083" ticks="576" interval="4">
<potts>
<potts.term id="volume" />
<potts.term id="adhesion" />
<potts.term id="surface" />
<!-- <potts.term id="persistence" /> -->
<!-- <potts.parameter term="adhesion" id="ADHESION" value="80" target="fly-neuron:*"/>
<potts.parameter term="adhesion" id="ADHESION" value="80" target="fly-gmc:*"/> -->
</potts>
<agents>
<populations>
<population id="fly-gmc" class="fly-gmc" init="1">
<population.link id="fly-neuron" weight="1"/>
<population.parameter id="proliferation/BASAL_APOPTOSIS_RATE" value="0"/>
<population.parameter id="CRITICAL_VOLUME" value="11" units="um^3" conversion="DS^-3" />
</population>
<population id="fly-neuron" class="fly-neuron" init="0">
<population.parameter id="proliferation/CELL_GROWTH_RATE" value="0"/>
<population.parameter id="proliferation/BASAL_APOPTOSIS_RATE" value="0"/>
<population.parameter id="CRITICAL_VOLUME" value="11" units="um^3" conversion="DS^-3" />
</population>
</populations>
</agents>
</series>
</set>
42 changes: 42 additions & 0 deletions setup/nb.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<set prefix="2025-10-23-01">

Check failure on line 1 in setup/nb.xml

View workflow job for this annotation

GitHub Actions / checkstyle

[checkstyle] setup/nb.xml#L1 <com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck>

File does not end with a newline.
Raw output
/github/workspace/./setup/nb.xml:1:0: error: File does not end with a newline. (com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck)
<series name="dd" start="1" end="1"
ds=".3" margin="0" height="1" length="802" width="802"
dt=".083" ticks="576" interval="4">
<potts>
<potts.term id="volume" />
<potts.term id="adhesion" />
<potts.term id="surface" />
</potts>
<agents>
<populations>
<population id="fly-stem-wt" class="fly-stem-wt" init="1" >
<population.link id="fly-gmc" weight="1"/>
<population.parameter id="proliferation/SIZE_TARGET" value="1.2" />
<population.parameter id="CRITICAL_VOLUME" value="52" units="um^3" conversion="DS^-3" />
<population.parameter id="proliferation/CELL_GROWTH_RATE" value="5" units="um^3/hour" conversion="DS^-3DT"/>
<population.parameter id="proliferation/BASAL_APOPTOSIS_RATE" value="0"/>
<population.parameter id="proliferation/DIV_ROTATION_DISTRIBUTION" value="NORMAL(MU=36,SIGMA=30)" />
<population.parameter id="proliferation/DIFFERENTIATION_RULESET" value="location" />
<population.parameter id="proliferation/DIFFERENTIATION_RULESET_EQUALITY_RANGE" value="10" />
<population.parameter id="proliferation/APICAL_AXIS_RULESET" value="uniform" />
<population.parameter id="proliferation/APICAL_AXIS_ROTATION_DISTRIBUTION" value="UNIFORM(MIN=0,MAX=360)" />
<population.parameter id= "proliferation/DYNAMIC_GROWTH_RATE_VOLUME" value="0" />
<population.parameter id= "proliferation/DYNAMIC_GROWTH_RATE_NB_CONTACT" value="0" />
<population.parameter id= "proliferation/VOLUME_BASED_CRITICAL_VOLUME" value="1" />
</population>
<population id="fly-gmc" class="fly-gmc" init="0">
<population.link id="fly-neuron" weight="1"/>
<population.parameter id="proliferation/BASAL_APOPTOSIS_RATE" value="0"/>
<population.parameter id="CRITICAL_VOLUME" value="11" units="um^3" conversion="DS^-3" />
<population.parameter id="proliferation/CELL_GROWTH_RATE" value="1.22" units="um^2/hour" conversion="DS^-2.DT"/>
<population.parameter id= "proliferation/DYNAMIC_GROWTH_RATE_VOLUME" value="0" />
</population>
<population id="fly-neuron" class="fly-neuron" init="0">
<population.parameter id="proliferation/CELL_GROWTH_RATE" value="0"/>
<population.parameter id="proliferation/BASAL_APOPTOSIS_RATE" value="0"/>
<population.parameter id="CRITICAL_VOLUME" value="11" units="um^3" conversion="DS^-3" />
</population>
</populations>
</agents>
</series>
</set>
23 changes: 23 additions & 0 deletions setup/neuron.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<set prefix="2024-10-25-04">

Check failure on line 1 in setup/neuron.xml

View workflow job for this annotation

GitHub Actions / checkstyle

[checkstyle] setup/neuron.xml#L1 <com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck>

File does not end with a newline.
Raw output
/github/workspace/./setup/neuron.xml:1:0: error: File does not end with a newline. (com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck)
<series name="dd" start="1" end="1"
ds=".3" margin="0" height="1" length="502" width="502"
dt=".083" ticks="576" interval="4">
<potts>
<potts.term id="volume" />
<potts.term id="adhesion" />
<potts.term id="surface" />
<potts.term id="persistence" />
<potts.parameter term="adhesion" id="ADHESION" value="80" target="fly-neuron:*"/>
</potts>
<agents>
<populations>
<population id="fly-neuron" class="fly-neuron" init="1">
<population.parameter id="proliferation/CELL_GROWTH_RATE" value="0"/>
<population.parameter id="proliferation/BASAL_APOPTOSIS_RATE" value="0"/>
<population.parameter id="CRITICAL_VOLUME" value="11" units="um^3" conversion="DS^-3" />
</population>

</populations>
</agents>
</series>
</set>
Loading
Loading