tlearn 0.0.2 → 0.0.3

data/ext/tlearn/tlearn_ext.c

@@ -122,35 +122,39 @@ extern int load_wts();
 extern int save_wts();
 extern int act_nds();
 
-extern int optind;
-
 
 int run_training(nsweeps, file_path, current_weights_output)
   long nsweeps;
   char *file_path;
   float *current_weights_output;
 {
-  int  argc = 1;
-  char *argv[argc];
-  argv[0] = "tlearn";
   int status;
-
+  int learning = 1;
+  int loadflag = 0;
+  
   backprop = 0;
-  status = run(argc,argv, nsweeps, file_path, backprop, current_weights_output);
+  status = run(learning, loadflag, nsweeps, file_path, backprop, current_weights_output);
 
   return(status);
 }
 
-int run_fitness(argc,argv, nsweeps, file_path, current_weights_output)
-  int  argc;
-  char  **argv;
+int run_fitness(nsweeps,file_path, current_weights_output)
   long nsweeps;
   char *file_path;
   float *current_weights_output;
 {
   int status;
   backprop = 1;
-  status = run(argc,argv, nsweeps, file_path, backprop, current_weights_output);
+  char weights[255];
+  
+  strcpy(weights, file_path);
+  strcat(weights, ".wts");
+  strcpy(loadfile,weights);
+  
+  int learning = 0;
+  int loadflag = 1; 
+  
+  status = run(learning, loadflag, nsweeps, file_path, backprop, current_weights_output);
 
   return(status);
 }
@@ -179,7 +183,6 @@ void post_cleanup(){
 }
 
 void cleanup_horrid_globals(){
-    optind  = 1;
     sweep = 0;
     tsweeps = 0;
     rate = .1;
@@ -213,15 +216,13 @@ void cleanup_horrid_globals(){
     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;
+int run(learning, loadflag, nsweeps, file_path, backprop, current_weights_output)
+  int learning;
+  int loadflag;
   long nsweeps;
   char *file_path;
   int backprop;
@@ -238,8 +239,8 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
 
   long  ttime = 0;  /* number of sweeps since time = 0 */
   long  utime = 0;  /* number of sweeps since last update_weights */
-  long  tmax = 0;  /* maximum number of sweeps (given in .data) */
-  long  umax = 0;  /* update weights every umax sweeps */
+  long  tmax = 0;   /* maximum number of sweeps (given in .data) */
+  long  umax = 0;   /* update weights every umax sweeps */
   long  rtime = 0;  /* number of sweeps since last rms_report */
   long  check = 0;  /* output weights every "check" sweeps */
   long  ctime = 0;  /* number of sweeps since last check */
@@ -249,19 +250,16 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
   int  j;
   int  k;
   int  nticks = 1;  /* number of internal clock ticks per input */
-  int  ticks = 0;  /* counter for ticks */
-  int  learning = 1;  /* flag for learning */
-  int  reset = 0;  /* flag for resetting net */
-  int  verify = 0;  /* flag for printing output values */
-  int  probe = 0;  /* flag for printing selected node values */
+  int  ticks = 0;   /* counter for ticks */
+  int  reset = 0;   /* flag for resetting net */
+
   int  command = 1;  /* flag for writing to .cmd file */
-  int  loadflag = 0;  /* flag for loading initial weights from file */
-  int  iflag = 0;  /* flag for -I */
-  int  tflag = 0;  /* flag for -T */
-  int  rflag = 0;  /* flag for -x */
-  int  seed = 0;  /* seed for random() */
+  int  iflag = 0;    /* flag for -I */
+  int  tflag = 0;    /* flag for -T */
+  int  rflag = 0;    /* flag for -x */
+  int  seed = 0;     /* seed for random() */
 
-  float  err = 0.;  /* cumulative ss error */
+  float  err = 0.;     /* cumulative ss error */
   float  ce_err = 0.;  /* cumulate cross_entropy error */
 
   float  *w;
@@ -272,110 +270,11 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
 
   struct  cf  *ci;
 
-  char  cmdfile[128];  /* filename for logging runs of program */
   char  cfile[128];  /* filename for .cf file */
 
-  FILE  *cmdfp;
-
-#ifdef  THINK_C
-  argc = ccommand(&argv);
-#endif  /* THINK_C */
-
-  signal(SIGINT, intr);
-#ifndef ibmpc
-#ifndef  THINK_C
-  signal(SIGHUP, intr);
-  signal(SIGQUIT, intr);
-  signal(SIGKILL, intr);
-#endif  /* THINK_C */
-#endif
-
-#ifndef ibmpc
-  exp_init();
-#endif
-
   root[0] = 0;
   strcpy(root, file_path);
 
-  while ((c = getopt(argc, argv, "f:hil:m:n:r:s:tC:E:ILM:PpRS:TU:VvXB:H:D:")) != EOF) {
-    switch (c) {
-      case 'C':
-        check = (long) atol(optarg);
-        ctime = check;
-        break;
-      case 'i':
-        command = 0;
-        break;
-      case 'l':
-        loadflag = 1;
-        strcpy(loadfile,optarg);
-        break;
-      case 'm':
-        momentum = (float) atof(optarg);
-        break;
-      case 'n':
-        nticks = (int) atoi(optarg);
-        break;
-      case 'P':
-        learning = 0;
-        /* drop through deliberately */
-      case 'p':
-        probe = 1;
-        break;
-      case 'r':
-        rate = (double) atof(optarg);
-        break;
-      case 't':
-        teacher = 1;
-        break;
-      case 'V':
-        learning = 0;
-        /* drop through deliberately */
-      case 'v':
-        verify = 1;
-        break;
-      case 'X':
-        rflag = 1;
-        break;
-      case 'E':
-        rms_report = (long) atol(optarg);
-        break;
-      case 'I':
-        iflag = 1;
-        break;
-      case 'M':
-        criterion = (float) atof(optarg);
-        break;
-      case 'R':
-        randomly = 1;
-        break;
-      case 'S':
-        seed = atoi(optarg);
-        break;
-      case 'T':
-        tflag = 1;
-        break;
-      case 'U':
-        umax = atol(optarg);
-        break;
-      case 'B':
-        init_bias = atof(optarg);
-        break;
-      /*
-       * if == 1, use cross-entropy as error;
-       * if == 2, also collect cross-entropy stats.
-       */
-      case 'H':
-        ce = atoi(optarg);
-        break;
-      case '?':
-      case 'h':
-      default:
-        usage();
-        return(2);
-      break;
-    }
-  }
   if (nsweeps == 0){
     perror("ERROR: No -s specified");
     return(1);
@@ -388,26 +287,6 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
     return(1);
   }
 
-  if (command){
-    sprintf(cmdfile, "%s.cmd", root);
-    cmdfp = fopen(cmdfile, "a");
-    if (cmdfp == NULL) {
-      perror("ERROR: Can't open .cmd file");
-      return(1);
-    }
-    for (i = 1; i < argc; i++)
-      fprintf(cmdfp,"%s ",argv[i]);
-    fprintf(cmdfp,"\n");
-    fflush(cmdfp);
-  }
-
-#ifndef  THINK_C
-  sprintf(cmdfile, "%s.pid", root);
-  fpid = fopen(cmdfile, "w");
-  fprintf(fpid, "%d\n",  getpid());
-  fclose(fpid);
-#endif  /* THINK_C */
-
   sprintf(cfile, "%s.cf", root);
   cfp = fopen(cfile, "r");
   if (cfp == NULL) {
@@ -421,12 +300,14 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
   get_connections();
   get_special();
   
-  if (!seed)
+  if (!seed){
     seed = time((time_t *) NULL);
+  }
   srandom(seed);
 
-  if (loadflag)
+  if (loadflag){
     load_wts();
+  }
   else {
     for (i = 0; i < nn; i++){
       w = *(wt + i);
@@ -479,22 +360,24 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
 
   nsweeps += tsweeps;
   for (sweep = tsweeps; sweep < nsweeps; sweep++){
-
     for (ticks = 0; ticks < nticks; ticks++){
 
       update_reset(ttime,ticks,rflag,&tmax,&reset);
 
       if (reset){
-        if (backprop == 0)
+        if (backprop == 0){
           reset_network(zold,znew,pold,pnew);
-        else
+        }
+		else{
           reset_bp_net(zold,znew);
+	    }
       }
 
       update_inputs(zold,ticks,iflag,&tmax,&linput);
 
-      if (learning || teacher || (rms_report != 0))
+      if (learning || teacher || (rms_report != 0)){
         update_targets(target,ttime,ticks,tflag,&tmax);
+	  }
 
       act_nds(zold,zmem,znew,wt,linput,target);
 
@@ -504,42 +387,27 @@ int run(argc,argv, nsweeps, file_path, backprop, current_weights_output)
         comp_deltas(pold,pnew,wt,dwt,zold,znew,error);
       if (learning && (backprop == 1))
         comp_backprop(wt,dwt,zold,zmem,target,error,linput);
-
-      if (probe)
-        print_nodes(zold);
     }
-    if (verify){
+    if (learning == 0){
       for (i = 0; i < no; i++){
         current_weights_output[i] = zold[ni+outputs[i]];
       }
     }
-    if (rms_report && (++rtime >= rms_report)){
-      rtime = 0;
-      if (ce == 2)
-        print_error(&ce_err);
-      else
-        print_error(&err);
-    }
 
-    if (check && (++ctime >= check)){
-      ctime = 0;
-      save_wts();
-    }
-
-    if (++ttime >= tmax)
+    if (++ttime >= tmax){
       ttime = 0;
-
+    }
     if (learning && (++utime >= umax)){
       utime = 0;
       update_weights(wt,dwt,winc);
     }
 
   }
-  if (learning)
+  if (learning){
     save_wts();
+  }
   
   return(0);
-
 }
 
 /* -- Ruby interface -- */
@@ -561,9 +429,6 @@ static VALUE tlearn_train(VALUE self, VALUE config) {
 }
 
 static VALUE tlearn_fitness(VALUE self, VALUE config) {
-  int  tlearn_args_count = 4;
-  char *tlearn_args[tlearn_args_count];
-
   VALUE ruby_array       = rb_ary_new();
   VALUE file_root_value  = rb_hash_aref(config, ID2SYM(rb_intern("file_root")));
 
@@ -571,20 +436,11 @@ static VALUE tlearn_fitness(VALUE self, VALUE config) {
   long nsweeps       = NUM2DBL(sweeps_value);
 
   char *file_root        = StringValueCStr(file_root_value);
-  char weights[strlen(file_root) + strlen(".wts")];
-
   float *result_weights; 
 
-  strcpy(weights, file_root);
-
-  tlearn_args[0] = "tlearn_fitness";
-  tlearn_args[1] = "-l";
-  tlearn_args[2] = strcat(weights, ".wts");
-  tlearn_args[3] = "-V";
-
   float current_weights_output[6];
 
-  int failure = run_fitness(tlearn_args_count, tlearn_args, nsweeps, file_root, current_weights_output);
+  int failure = run_fitness(nsweeps, file_root, current_weights_output);
 
   post_cleanup();
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tlearn
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000Z
+date: 2012-11-03 00:00:00.000000000Z
 dependencies: []
 description: 
 email: