lib/fathom.rb in fathom-0.2.2 vs lib/fathom.rb in fathom-0.2.3

@@ -9,56 +9,57 @@
 require "gsl"
 require 'options_hash'
 
 require 'ext/open_struct'
 require 'ext/array'
+require 'ext/string'
 
 module Fathom
   lib = File.expand_path(File.dirname(__FILE__))
   $LOAD_PATH.unshift(lib)
   
   # Autoload classes and modules so that we only load as much of the library as we're using.
   # This allows us to have a fairly large library without taking up a lot of memory unless we need it.
   autoload :Inverter, "inverter"
-  autoload :BasicNode, "basic_node"
+  autoload :Node, "node"
   autoload :PlausibleRange, "plausible_range"
-  autoload :R, "plausible_range"
-  # autoload :LowerBound, "lower_bound"
-  # autoload :UpperBound, "upper_bound"
-  # autoload :Distribution, "distribution"
-  # autoload :DependencyGraph, "dependency_graph"
   autoload :ValueDescription, "value_description"
   autoload :ValueAggregator, "value_aggregator"
   autoload :ValueMultiplier, "value_multiplier"
   autoload :MonteCarloSet, "monte_carlo_set"
-  autoload :CombinedPlausibilities, "combined_plausibilities"
   autoload :CausalGraph, "causal_graph"
   autoload :DataNode, "data_node"
   autoload :KnowledgeBase, "knowledge_base"
 
   autoload :Import, "import"
   autoload :YAMLImport, 'import/yaml_import'
   autoload :CSVImport, 'import/csv_import'
   autoload :RDFImport, 'import/rdf_import'
   autoload :SQLiteImport, 'import/sqlite_import'
   
-  autoload :NodeUtilities, 'node_utilities'
-  
   autoload :Simulation, 'simulation'
   autoload :TickMethods, 'simulation/tick_methods'
   autoload :TickSimulation, 'simulation/tick_simulation'
 
   autoload :Agent, 'agent'
   autoload :Properties, 'agent/properties'
   autoload :AgentCluster, 'agent/agent_cluster'
+  
+  autoload :NumericMethods, 'numeric_methods'
+  autoload :EnforcedName, 'enforced_name'
+  
+  autoload :Distributions, 'distributions'
+  module Distributions
+    autoload :Gaussian, 'distributions/gaussian'
+    autoload :Uniform, 'distributions/uniform'
+    autoload :DiscreteGaussian, 'distributions/discrete_gaussian'
+    autoload :DiscreteUniform, 'distributions/discrete_uniform'
+  end
 
   def knowledge_base
     @knowledge_base ||= KnowledgeBase.new
   end
   alias :kb :knowledge_base
 end
 
 # Temporary
 include Fathom
-def r
-  @r ||= R.new(:min => 1, :max => 10)
-end
\ No newline at end of file