tlearn 0.0.1 → 0.0.2

data/ext/tlearn/subs.c

@@ -47,6 +47,8 @@ extern	long	rms_report;	/* report error every report sweeps */
 
 extern	float	criterion;	/* exit program when rms error < criterion */
 
+extern int start = 1;
+
 
 float rans(w)
 	float	w;
@@ -109,7 +111,6 @@ print_output(aold)
 print_error(e)
 	float	*e;
 {
-	static	int	start = 1;
 	static	FILE	*fp;
 
 	FILE	*fopen();

data/ext/tlearn/tlearn_ext.c

@@ -76,6 +76,8 @@ extern int  *outputs;    /* (no) indices of output nodes */
 extern int  *selects;    /* (nn+1) nodes selected for probe printout */
 extern int  *linput;     /* (ni) localist input array */
 
+extern float *otarget;
+
 extern float  *znew;     /* (nt) inputs and activations at time t+1 */
 extern float  *zold;     /* (nt) inputs and activations at time t */
 extern float  *zmem;     /* (nt) inputs and activations at time t */
@@ -107,6 +109,7 @@ extern int  localist;  /* flag for speed-up with localist inputs */
 extern int  randomly;  /* flag for presenting inputs in random order */
 extern int  limits;    /* flag for limited weights */
 extern int  ce;        /* flag for cross_entropy */
+extern int start;
 
 extern char  root[128];  /* root filename for .cf, .data, .teach, etc.*/
 extern char  loadfile[128];  /* filename for weightfile to be read in */
@@ -152,6 +155,70 @@ int run_fitness(argc,argv, nsweeps, file_path, current_weights_output)
   return(status);
 }
 
+void post_cleanup(){
+	free(outputs);
+	free(selects);
+	free(linput);
+
+	free(ninfo);
+	free(cinfo);
+
+	free(znew);
+	free(zold);
+	free(zmem);
+	free(wt);
+	free(dwt);
+	free(winc);
+	free(target);
+	free(error);
+	free(pnew);
+	free(pold);
+
+	free(otarget);
+	free(data);
+}
+
+void cleanup_horrid_globals(){
+    optind  = 1;
+    sweep = 0;
+    tsweeps = 0;
+    rate = .1;
+    momentum = 0.;
+    weight_limit = 1.;
+    criterion = 0.;
+    init_bias = 0.;
+    rms_report = 0;
+    ngroups = 0;
+    teacher = 0;
+    localist = 0;
+    randomly = 0;
+    limits = 0;
+    ce = 0;
+    outputs = 0;
+    selects = 0;
+    linput = 0;
+    cinfo = 0;
+    ninfo = 0;
+    znew = 0;
+    zold = 0;
+    zmem = 0;
+    pnew = 0;
+    pold = 0;
+    wt = 0;
+    dwt = 0;
+    winc = 0;
+    target = 0;
+    error = 0;
+    cfp = 0;
+    data = 0;
+    ngroups = 0;
+    root[0] = 0;
+    loadfile[0] = 0;
+
+	otarget = 0;
+	start = 1;
+}
+
 int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
   int  argc;
   char  **argv;
@@ -160,42 +227,8 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
   int backprop;
   float *current_weights_output;
 {
-  //Reset EVERYTHING. Globals, such a great idea...
-  optind  = 1;
-  sweep = 0;
-  tsweeps = 0;
-  rate = .1;
-  momentum = 0.;
-  weight_limit = 1.;
-  criterion = 0.;
-  init_bias = 0.;
-  rms_report = 0;
-  ngroups = 0;
-  teacher = 0;
-  localist = 0;
-  randomly = 0;
-  limits = 0;
-  ce = 0;
-  outputs = 0;
-  selects = 0;
-  linput = 0;
-  cinfo = 0;
-  ninfo = 0;
-  znew = 0;
-  zold = 0;
-  zmem = 0;
-  pnew = 0;
-  pold = 0;
-  wt = 0;
-  dwt = 0;
-  winc = 0;
-  target = 0;
-  error = 0;
-  cfp = 0;
-  data = 0;
-  ngroups = 0;
-  root[0] = 0;
-  loadfile[0] = 0;
+
+  cleanup_horrid_globals();
 
   FILE  *fopen();
   FILE  *fpid;
@@ -479,8 +512,6 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
       for (i = 0; i < no; i++){
         current_weights_output[i] = zold[ni+outputs[i]];
       }
-
-      //print_output(zold);
     }
     if (rms_report && (++rtime >= rms_report)){
       rtime = 0;
@@ -513,15 +544,6 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
 
 /* -- Ruby interface -- */
 
-int do_print(VALUE key, VALUE val, VALUE in) {
-  fprintf(stderr, "Input data is %s\n", StringValueCStr(in));
-
-  fprintf(stderr, "Key %s=>Value %s\n", StringValueCStr(key),
-         StringValueCStr(val));
-
-  return ST_CONTINUE;
-}
-
 static VALUE tlearn_train(VALUE self, VALUE config) {
   VALUE sweeps_value = rb_hash_aref(config, ID2SYM(rb_intern("sweeps")));
   long nsweeps       = NUM2DBL(sweeps_value);
@@ -532,6 +554,9 @@ static VALUE tlearn_train(VALUE self, VALUE config) {
   float current_weights_output[6];
   
   int result = run_training(nsweeps, file_root, current_weights_output);
+
+  post_cleanup();
+
   return rb_int_new(result);
 }
 
@@ -561,6 +586,8 @@ static VALUE tlearn_fitness(VALUE self, VALUE config) {
 
   int failure = run_fitness(tlearn_args_count, tlearn_args, nsweeps, file_root, current_weights_output);
 
+  post_cleanup();
+
   if(failure == 0){
     float weight;
     int result_index;

data/ext/tlearn/update.c

@@ -50,6 +50,9 @@ extern	int	randomly;	/* flag for presenting inputs in random order */
 extern	int	localist;	/* flag for localist inputs */
 extern	int	limits;		/* flag for limited weights */
 
+extern	float *otarget = 0;	/* (no) back-up copy of target values */
+
+
 long	dc = 0;
 int	*ldata = 0;
 
@@ -246,8 +249,6 @@ update_targets(atarget,time,tick,flag,maxtime)
 
 	static	long	next;		/* next time tag in .teach file */
 
-	static	float	*otarget = 0;	/* (no) back-up copy of target values */
-
 	static	FILE	*fp;
 
 	char	buf[128];

data/lib/tlearn/config.rb

@@ -5,10 +5,14 @@ module TLearn
     NUMBER_OF_RESET_TIMEPOINTS = 3497
     DEFAULT_NUMBER_OF_SWEEPS = 1333000
     
-    def initialize(config)
-      @connections_config = config[:connections] || {}
-      @special_config     = config[:special]     || {}
-      @nodes_config       = config[:nodes]       || {}
+    def initialize(config, working_dir = nil)
+      @connections_config = config.delete(:connections) || {}
+      @config             = config                      || {}
+      @working_dir = working_dir || WORKING_DIR
+    end
+
+    def working_dir
+      @working_dir
     end
 
     def setup_config(training_data)
@@ -30,21 +34,35 @@ module TLearn
     end
 
     def file_root
-      "#{WORKING_DIR}/#{TLEARN_NAMESPACE}"
+      "#{working_dir}/#{TLEARN_NAMESPACE}"
     end
 
     private
 
     def connections_ranges_to_strings(connections_config)
-      connections_config.map{|hash| {hash.keys[0].to_s.gsub('..','-') => hash.values[0]}}
+      connections_config.map{|hash| {input_to_config_string(hash.keys[0]) => input_to_config_string(hash.values[0])}}
+    end
+
+    def input_to_config_string(input)
+      if input.is_a?(Hash)
+        "#{input[:min]} & #{input[:max]}"
+      elsif input.is_a?(Range)
+        input.to_s.gsub('..','-')
+      elsif input.is_a?(Array)
+        values = input.map{|value| input_to_config_string(value)}
+        values[0] = values[0] + " ="
+        values.join(" ").gsub('one_to_one', 'one-to-one')
+      else
+        input
+      end
     end
 
     def evaulator_config(training_data)
       nodes_config = {
-        :nodes => @nodes_config[:number_of_nodes],
+        :nodes => @config[:number_of_nodes],
         :inputs => training_data.no_of_inputs,
         :outputs => training_data.no_of_outputs,
-        :output_nodes => @nodes_config[:output_nodes]
+        :output_nodes => input_to_config_string(@config[:output_nodes])
       }
 
       @connections_config = connections_ranges_to_strings(@connections_config)
@@ -53,9 +71,13 @@ module TLearn
       node_config_strings = nodes_config.map{|key,value| "#{key.to_s.gsub('_',' ')} = #{value}" }
       node_config_strings << "output nodes are #{output_nodes}"
 
-      connection_config_strings = @connections_config.map{|mapping| "#{mapping.keys[0]} from #{mapping.values[0]}" }
+      connection_config_strings = @connections_config.map{|mapping| "#{mapping.keys[0]} from #{input_to_config_string(mapping.values[0])}" }
       connection_config_strings =  ["groups = #{0}"] + connection_config_strings
-    
+      
+      special_config = {}
+      special_config[:linear] = @config[:linear]
+      special_config[:weight_limit] = @config[:weight_limit]
+      special_config[:selected] = @config[:selected]
 
       config = <<EOS
 NODES:
@@ -63,7 +85,7 @@ NODES:
 CONNECTIONS:
 #{connection_config_strings.join("\n")}
 SPECIAL:
-#{@special_config.map{|key,value| "#{key} = #{value}" }.join("\n")}
+#{special_config.map{|key,value| "#{key} = #{input_to_config_string(value)}" }.join("\n")}
 EOS
     end
 

data/lib/tlearn/run.rb

@@ -6,8 +6,8 @@ module TLearn
       @out = out
     end
 
-    def train(data, number_of_sweeps = nil)
-      run_tlearn = RunTLearn.new(@config)
+    def train(data, number_of_sweeps = nil, working_dir = nil)
+      run_tlearn = RunTLearn.new(@config, working_dir)
 
       results = run_tlearn.train(TrainingData.new(data), number_of_sweeps)
       
@@ -19,8 +19,8 @@ module TLearn
       end
     end
 
-    def fitness(data, number_of_sweeps = nil)
-      run_tlearn = RunTLearn.new(@config)
+    def fitness(data, number_of_sweeps = nil, working_dir = nil)
+      run_tlearn = RunTLearn.new(@config, working_dir)
 
       run_tlearn.fitness(FitnessData.new(data), number_of_sweeps)
     end

data/lib/tlearn/run_tlearn.rb

@@ -2,8 +2,8 @@ module TLearn
   class RunTLearn
     class UntrainedError < Exception; end;
   
-    def initialize(config = {})
-      @config = Config.new(config)
+    def initialize(config = {}, working_dir = nil)
+      @config = Config.new(config, working_dir)
     end
   
     def fitness(data, number_of_sweeps = @config.number_of_sweeps)
@@ -25,8 +25,8 @@ module TLearn
       execute_tlearn_train(number_of_sweeps)
           
       if training_successful?(number_of_sweeps)
-        weights = File.read("#{Config::WORKING_DIR}/#{Config::TLEARN_NAMESPACE}.#{number_of_sweeps}.wts").split("\n")
-        `cp #{Config::WORKING_DIR}/#{Config::TLEARN_NAMESPACE}.#{number_of_sweeps}.wts #{Config::WORKING_DIR}/#{Config::TLEARN_NAMESPACE}.wts`
+        weights = File.read("#{@config.working_dir}/#{Config::TLEARN_NAMESPACE}.#{number_of_sweeps}.wts").split("\n")
+        `cp #{@config.working_dir}/#{Config::TLEARN_NAMESPACE}.#{number_of_sweeps}.wts #{@config.working_dir}/#{Config::TLEARN_NAMESPACE}.wts`
         weights.map{|line| line.split("\t").map{|number| number.strip}}
       else
         false
@@ -36,7 +36,7 @@ module TLearn
     private
     
     def file_root
-      "#{File.expand_path(Config::WORKING_DIR)}/#{Config::TLEARN_NAMESPACE}"
+      "#{File.expand_path(@config.working_dir)}/#{Config::TLEARN_NAMESPACE}"
     end
 
     def clear_previous_fitness_session
@@ -45,7 +45,7 @@ module TLearn
     end
 
     def clear_entire_training_data
-      FileUtils.rm_f(Dir.glob("#{Config::WORKING_DIR}/*"))
+      FileUtils.rm_f(Dir.glob("#{@config.working_dir}/*"))
     end
     
     def training_successful?(number_of_sweeps)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tlearn
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000Z
 dependencies: []
 description: 
 email:
@@ -57,8 +57,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: ruby bindings for tlearn
+summary: Ruby bindings for tlearn
 test_files: []
+has_rdoc: