Skip to content

Fix non-square Jelly simulation. #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Basiliotornado wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix non-square Jelly simulation. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b9c8ee
Fix CW/CH order and calculations in utils.
Basiliotornado May 17, 2025
c209cf5
Genius
Basiliotornado May 17, 2025
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
6 changes: 3 additions & 3 deletions jes_sim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def getCalmStates(self, gen, startIndex, endIndex, frameCount, calmingRun):

def getStartingNodeCoor(self, gen, startIndex, endIndex, fromCalmState):
COUNT = endIndex-startIndex
n = np.zeros((COUNT,self.CH+1,self.CW+1,self.node_coor_count))
n = np.zeros((COUNT,self.CW+1,self.CH+1,self.node_coor_count))
if not fromCalmState or self.creatures[gen][0].calmState is None:
# create grid of nodes along perfect gridlines
coorGrid = np.mgrid[0:self.CW+1,0:self.CH+1]
Expand All @@ -93,10 +93,10 @@ def getStartingNodeCoor(self, gen, startIndex, endIndex, fromCalmState):

def getMuscleArray(self, gen, startIndex, endIndex):
COUNT = endIndex-startIndex
m = np.zeros((COUNT,self.CH,self.CW,self.beats_per_cycle,self.traits_per_box+1)) # add one trait for diagonal length.
m = np.zeros((COUNT,self.CW,self.CH,self.beats_per_cycle,self.traits_per_box+1)) # add one trait for diagonal length.
DNA_LEN = self.CH*self.CW*self.beats_per_cycle*self.traits_per_box
for c in range(startIndex,endIndex):
dna = self.creatures[gen][c].dna[0:DNA_LEN].reshape(self.CH,self.CW,self.beats_per_cycle,self.traits_per_box)
dna = self.creatures[gen][c].dna[0:DNA_LEN].reshape(self.CW,self.CH,self.beats_per_cycle,self.traits_per_box)
m[c-startIndex,:,:,:,:self.traits_per_box] = 1.0+(dna)/3.0
m[:,:,:,:,3] = np.sqrt(np.square(m[:,:,:,:,0])+np.square(m[:,:,:,:,1])) # Set diagonal tendons
return m
Expand Down
8 changes: 4 additions & 4 deletions jes_ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ def __init__(self, _W_W, _W_H, _MOVIE_SINGLE_DIM, _GRAPH_COOR, _SAC_COOR, _GENEA
self.sliderList = []
self.buttonList = []
pygame.font.init()
self.bigFont = pygame.font.Font('C:/Users/caryk/AppData/Local/Microsoft/Windows/Fonts/Jygquip 1.ttf', 60)
self.smallFont = pygame.font.Font('C:/Users/caryk/AppData/Local/Microsoft/Windows/Fonts/Jygquip 1.ttf', 30)
self.tinyFont = pygame.font.Font('C:/Users/caryk/AppData/Local/Microsoft/Windows/Fonts/Jygquip 1.ttf', 21)
self.bigFont = pygame.font.Font('visuals/Arial.ttf', 60)
self.smallFont = pygame.font.Font('visuals/Arial.ttf', 30)
self.tinyFont = pygame.font.Font('visuals/Arial.ttf', 21)
self.BACKGROUND_PIC = pygame.image.load("visuals/background.png")
self.W_W = _W_W
self.W_H = _W_H
Expand Down Expand Up @@ -331,7 +331,7 @@ def doMovies(self):
if self.sample_frames >= self.sim.trial_time+self.SAMPLE_FREEZE_TIME:
self.startSampleHelper()
for i in range(L):
if self.visualSimMemory[i][2] < self.sim.trial_time:
if self.visualSimMemory[i][2] < self.sim.trial_time:
self.visualSimMemory[i] = self.sim.simulateRun(self.visualSimMemory[i], 1, False)
DIM = arrayIntMultiply(self.MOVIE_SINGLE_DIM, MSCALE[self.CLH[0]])
self.movieScreens[i] = pygame.Surface(DIM, pygame.SRCALPHA, 32)
Expand Down
14 changes: 6 additions & 8 deletions utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ def applyMuscles(n,m,muscle_coef):
MAs = [None]*6
segments = [[0,0,1,0],[0,1,1,1],
[0,0,0,1],[1,0,1,1],[0,0,1,1],[0,1,1,0]]
segments2 = [[0,0,1,0],[0,1,1,1],
[0,0,0,1],[1,0,1,1],[0,0,1,1],[0,1,1,0]]


MAs[0] = getMuscleAttraction(xNeighborDists[:,:,:-1],m[:,:,:,0],muscle_coef)
Expand All @@ -127,8 +125,8 @@ def applyMuscles(n,m,muscle_coef):

for dire in range(6):
s = segments[dire]
sli1 = n[:,s[0]:s[0]+CW,s[1]:s[1]+CW]
sli2 = n[:,s[2]:s[2]+CH,s[3]:s[3]+CH]
sli1 = n[:,s[0]:s[0]+CW,s[1]:s[1]+CH]
sli2 = n[:,s[2]:s[2]+CW,s[3]:s[3]+CH]

delta_x = sli1[:,:,:,0]-sli2[:,:,:,0]
delta_y = sli1[:,:,:,1]-sli2[:,:,:,1]
Expand All @@ -137,10 +135,10 @@ def applyMuscles(n,m,muscle_coef):
delta_nx = delta_x/delta_magnitude
delta_ny = delta_y/delta_magnitude

n[:,s[0]:s[0]+CW,s[1]:s[1]+CW,2] += delta_nx*MAs[dire]
n[:,s[0]:s[0]+CW,s[1]:s[1]+CW,3] += delta_ny*MAs[dire]
n[:,s[2]:s[2]+CH,s[3]:s[3]+CH,2] -= delta_nx*MAs[dire]
n[:,s[2]:s[2]+CH,s[3]:s[3]+CH,3] -= delta_ny*MAs[dire]
n[:,s[0]:s[0]+CW,s[1]:s[1]+CH,2] += delta_nx*MAs[dire]
n[:,s[0]:s[0]+CW,s[1]:s[1]+CH,3] += delta_ny*MAs[dire]
n[:,s[2]:s[2]+CW,s[3]:s[3]+CH,2] -= delta_nx*MAs[dire]
n[:,s[2]:s[2]+CW,s[3]:s[3]+CH,3] -= delta_ny*MAs[dire]

def getMuscleAttraction(dists,m,muscle_coef):
return (m-dists)*muscle_coef
Expand Down