NetAnalyzer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 727af54e55b813b7fa85e05009bcb96d448f0c53
-  data.tar.gz: de44f4108459832c9f4fa833d1b9145fc84d352c
+  metadata.gz: 412854b58d2f6a2dbb1844cb943a90c9b96f7fd6
+  data.tar.gz: df275072cb0d1bb9b9d15099b089897471566eb8
 SHA512:
-  metadata.gz: 23a875e1483ddda5f2ae1c5ad4c7e0b29bdde9b59255de09fd0f93fe2183263a3e5f197af50bad84e1164d669778439a17e40ead514d67e34312ed683c6fd2a3
-  data.tar.gz: 8a26685f7232671499994564613d6cb6171819905be75cd4501986deca6ce82812dc38802ae7b0ff62002209d775ec775394b8d2f9ca0ee5d52e59d081d8a7d2
+  metadata.gz: a6d3be799d9def07f7addef75dfad5a8d1c6b9d14c684d3dcb227b6be68ef22912ab069beb2e439d07a08b7dc2a6d7d0f38e873a1303a099c3c110c9cf6b075b
+  data.tar.gz: 561ad012584a397023897047b0e401a96246d39a67082f0c7cfd3ee6dc3cb8075d77d08bb75ae34a8174cbc13e5a8439f0348175f38133162f54ef9e6b55c07c

data/bin/NetAnalyzer.rb

@@ -2,7 +2,6 @@
 
 ROOT_PATH = File.dirname(__FILE__)
 $: << File.expand_path(File.join(ROOT_PATH, '..', 'lib', 'NetAnalyzer'))
-$: << File.expand_path(File.join(ROOT_PATH, '..', 'lib', 'NetAnalyzer', 'methods'))
 
 require 'network'
 require 'optparse'

data/lib/NetAnalyzer/network.rb

@@ -206,9 +206,10 @@ class Network
 	end
 
 	def get_geometric_associations(layers, base_layer)
+		#wang 2016 method
 		relations = get_associations(layers, base_layer) do |associatedIDs_node1, associatedIDs_node2, intersectedIDs, node1, node2|	
 			intersectedIDs = intersectedIDs.length**2
-			productLength = associatedIDs_node1.length * associatedIDs_node2.length
+			productLength = Math.sqrt(associatedIDs_node1.length * associatedIDs_node2.length)
 			geometricValue = intersectedIDs.to_f/productLength
 		end
 		@association_values[:geometric] = relations
@@ -250,14 +251,15 @@ class Network
 			#Using index from A layer proyected to B
 			(intersection_lengths..minLength).each do |i|
 				binom_product = binom(nA, i) * binom(ny - nA, nB - i)
-				binom_product_float = binom_product.to_f
-				to_f = false
-				if binom_product_float.infinite? # Handle bignum coercition to bigdecimal to avoid infinity values on float class. 
-					binom_product_float = BigDecimal.new(binom_product)
-					to_f = true
-				end
-				sum += binom_product_float / binom(ny, nB)
-				sum = sum.to_f if to_f # once the operation has finished, sum is corced from bigdecimal to float
+				sum += binom_product.fdiv(binom(ny, nB))
+				# binom_product_float = binom_product.to_f
+				# to_f = false
+				# if binom_product_float.infinite? # Handle bignum coercition to bigdecimal to avoid infinity values on float class. 
+				# 	binom_product_float = BigDecimal.new(binom_product)
+				# 	to_f = true
+				# end
+				# sum += binom_product_float / binom(ny, nB)
+				# sum = sum.to_f if to_f # once the operation has finished, sum is corced from bigdecimal to float
 			end
 			if sum == 0
 				hypergeometricValue = 0

data/lib/NetAnalyzer/version.rb

@@ -1,3 +1,3 @@
 module NetAnalyzer
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: NetAnalyzer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Elena Rojano, Pedro Seoane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler