deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Finding free space from the way near commit which is downward

Browse source
This commit is contained in:
Sato Hiroyuki 2013-02-27 21:49:53 +09:00
parent aa36f07a02
commit f11e855bdb
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/graph/json_builder.rb
View file

@ -136,9 +136,9 @@ module Graph
end end
space = if commit.space >= parent.space then space = if commit.space >= parent.space then
find_free_parent_space(range, parent.space, 1, commit.space, times) find_free_parent_space(range, parent.space, -1, commit.space, times)
else else
find_free_parent_space(range, parent.space, -1, parent.space, times) find_free_parent_space(range, commit.space, -1, parent.space, times)
end end
mark_reserved(range, space) mark_reserved(range, space)
@ -151,7 +151,7 @@ module Graph
def find_free_parent_space(range, space_base, space_step, space_default, times) def find_free_parent_space(range, space_base, space_step, space_default, times)
if is_overlap?(range, times, space_default) then if is_overlap?(range, times, space_default) then
find_free_space(range, space_base, space_step) find_free_space(range, space_base, space_step, space_default)
else else
space_default space_default
end end
@ -221,17 +221,17 @@ module Graph
end end
end end
def find_free_space(time_range, space_base, space_step) def find_free_space(time_range, space_base, space_step, space_default = 1)
reserved = [] reserved = []
for day in time_range for day in time_range
reserved += @_reserved[day] reserved += @_reserved[day]
end end
reserved.uniq! reserved.uniq!
space = space_base space = space_default
while reserved.include?(space) do while reserved.include?(space) do
space += space_step space += space_step
if space <= 0 then if space < space_base then
space_step *= -1 space_step *= -1
space = space_base + space_step space = space_base + space_step
end end