Skip to content

Commit

Permalink
fix issue when group is not set
Browse files Browse the repository at this point in the history
  • Loading branch information
webmaster444 committed Sep 13, 2017
1 parent 61e71bf commit 0106c8f
Show file tree
Hide file tree
Showing 4 changed files with 607 additions and 14 deletions.
39 changes: 25 additions & 14 deletions app/controllers/maps_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,18 @@ def vsd
end
end

def vcm
def vcm
@map = Map.find(params[:id])

@trait = Trait.find(@map.trait_id)
group_ids = @map.traitgroups_id.split(',')
@traitgroups = Traitgroup.find(group_ids)
@group_array = Array.new
@traitgroups.each do |group|
@group_array.push(group.trait_group_name)
unless @map.traitgroups_id.nil?
group_ids = @map.traitgroups_id.split(',')

@traitgroups = Traitgroup.find(group_ids)
@group_array = Array.new
@traitgroups.each do |group|
@group_array.push(group.trait_group_name)
end
end

unless @map.sourcefile.nil?
Expand Down Expand Up @@ -103,11 +106,14 @@ def vgs
@map = Map.find(params[:id])

@trait = Trait.find(@map.trait_id)
group_ids = @map.traitgroups_id.split(',')
@traitgroups = Traitgroup.find(group_ids)
@group_array = Array.new
@traitgroups.each do |group|
@group_array.push(group.trait_group_name)
unless @map.traitgroups_id.nil?
group_ids = @map.traitgroups_id.split(',')

@traitgroups = Traitgroup.find(group_ids)
@group_array = Array.new
@traitgroups.each do |group|
@group_array.push(group.trait_group_name)
end
end

unless @map.sourcefile.nil?
Expand Down Expand Up @@ -250,15 +256,20 @@ def percentile(values, percentile)
return values_sorted[k] + (f * (values_sorted[k+1] - values_sorted[k]))
end
def count_min_to_max(arr,min,max)
cnt = 0
cnt = 0
arr.each do |element|
if ( element.to_f >= min.to_f && element.to_f <=max.to_f)
cnt +=1
end
end
cnt
cnt
end
end
def calc_cor(x,y,n)
deno = sqrt(x**2 - (x**2)/n) * sqrt(y**2 - (y**2)/n)
nume = x*y - x*y/n
nume / deno
end
end



Binary file modified db/development.sqlite3
Binary file not shown.
Loading

0 comments on commit 0106c8f

Please sign in to comment.