FIXING STUFF!

Rename should be complete or almost so.

bin/dataset

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os,sys
-from fluents import dataset
+from laydi import dataset
 import cfgparse, optparse
 import re
 
@@ -61,8 +61,8 @@ def list_dimension_ids(input, dimname):
                 print id
             
 def parse_options():
-    conf_files = ['/etc/fluentsrc',
-                  os.path.join(os.environ['HOME'], '.fluents')]
+    conf_files = ['/etc/laydirc',
+                  os.path.join(os.environ['HOME'], '.laydi')]
 
     cp = cfgparse.ConfigParser()
     op = optparse.OptionParser()

bin/laydi

@@ -3,16 +3,16 @@
 from getopt import getopt
 import os
 import sys
-from fluents import fluents, project, workflow, main
+from laydi import laydi, project, workflow, main
 #import workflows
-from fluents import cfgparse
+from laydi import cfgparse
 import optparse
 
 PROGRAM_NAME = 'laydi'
 VERSION = '0.1.0'
 
 def list_workflows():
-    print 'fluents %s' % VERSION
+    print 'laydi %s' % VERSION
     print
     print 'Available workflows:'
 
@@ -22,8 +22,8 @@ def list_workflows():
     print
 
 def parse_options():
-    conf_files = ['/etc/fluentsrc',
-                  os.path.join(os.environ['HOME'], '.fluents')]
+    conf_files = ['/etc/laydirc',
+                  os.path.join(os.environ['HOME'], '.laydi')]
 
     cp = cfgparse.ConfigParser()
 
@@ -81,7 +81,7 @@ if __name__ == '__main__':
 
     main.set_workflow(selected_wf())
     main.set_options(options)
-    app = fluents.FluentApp()
+    app = laydi.LaydiApp()
 
     main.set_application(app)
     main.set_project(project.Project())

bin/mat2ftsv

@@ -4,7 +4,7 @@ import sys
 from getopt import getopt
 
 def show_help():
-    print "mat2ftsv - Matlab matrix to fluents dataset converter."
+    print "mat2ftsv - Matlab matrix to laydi dataset converter."
     print
     print "Usage: mat2ftsv <mat-file> [<matfile> ...]"
     print 
@@ -26,7 +26,7 @@ if len(params) == 0:
 
 from scipy import io
 from numpy import ndarray
-from fluents import dataset
+from laydi import dataset
 
 fn_in = params[0]
 data = io.loadmat(fn_in)