Index: openacs-4/packages/accounts-finance/tcl/modeling.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/accounts-finance/tcl/Attic/modeling.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/accounts-finance/tcl/modeling.tcl	16 May 2010 22:50:18 -0000	1.1
+++ openacs-4/packages/accounts-finance/tcl/modeling.tcl	17 May 2010 12:03:25 -0000	1.2
@@ -7,19 +7,20 @@
 
 namespace eval acc_fin {}
 
-ad_proc -private qaf_process_model { model } {
+ad_proc -private acc_fin::qaf_process_model { model } {
      returns calculation friendly list of lists from model represented in shorthand
     shorthand consists of these parts:
 section 1: initial calculations and conditions
 section 2: repeating calculations (in order calculated)
-section 3: list of variables to report with each iteration
+section 3: list of variables to report with iterations
+section 4: analysis calculations
   Each section is separated by a line with '\#'.
 } {
   # split model by '#' into these parts:
   # 1. initial calculations and conditions (including number of iterations)
   # 2. repeating calculations
-  # 3. items to report after X iterations starting with iteration number Y
-  # 4. additional items to report at end of iterations
+  # 3. items to report for each Nth iteration ( starting with iteration number M?)
+  # 4. analysis calculations to report at end of iterations
 
   # then split each section into "lines" by CR
 
@@ -56,38 +57,73 @@
             if { $section_count < 3 } {
                 set section_list [split $model_section \n\r]
                 foreach calc_line $section_list {
+                    if { ![regsub -- {=} $calc_line "\[expr " calc_line] } {
+                        append err_text "'${calc_line}' ignored. No equal sign found.\n"
+                        incr err_state
+                        set $calc_line ""
+                    }
+                    set calc_line "set ${calc_line}\]"
+                    set varname [trim [string range ${calc_line} 5 [string first expr $calc_line]-2]]
+                    if { ![info exists $varname_list] } {
+                        # create list and array history for each variable
+                        set ${varname}_list [list]
+                        array set ${varname}_arr [list]
+
+
+                    }
+                }
+            }
+            if { $section_count eq 1 } {
+                foreach calc_line $section_list {
+                    # substitute var_arr(0) for variables on left side
+                    # initial period is period 0
+                }
+            }
+
+            if { $section_count eq 2 } {
+                foreach calc_line $section_list {
+                    # substitute var_arr($previous_period) for variables on right side
+                    # substitute var_arr($current_period) for variables on left side
+                }
+            }
+
+
+
+            if { $section_count eq 3 } {
+                set section_list [split $model_section \n\r\ \,]
+                set variables_list [list]
+                # report values 
+                # convert to list of variables that get converted into a list of lists.
+                # to be processed externally (sorted etc)
+                foreach named_var $section_list {
+                    set named_var [trim $named_var]
+                    if { [string length $named_var] > 0 } {
+                        lappend variables_list $named_var
+                    }
+                }
+            }
+            
+            if { $section_count eq 4 } {
+                set section_list [split $model_section \n\r]
+                foreach calc_line $section_list {
                     if { ![regsub -- {=} $calc_line {} calc_line] } {
                         append err_text "'${calc_line}' ignored. No equal sign found.\n"
                         incr err_state
                         set $calc_line ""
                     }
                     set calc_line "set ${calc_line}"
                 }
-                if { $section_count eq 3 } {
-                    set section_list [split $model_section \n\r\ \,]
-                    set variables_list [list]
-                    # report values 
-                    # convert to list of variables that get converted into a list of lists.
-                    # to be processed externally (sorted etc)
-                    foreach named_var $section_list {
-                        set named_var [trim $named_var]
-                        if { [string length $named_var] > 0 } {
-                            lappend variables_list $named_var
-                        }
-                    }
-                } 
-                
             }
-                
         } 
+# process model
 
+# repeat section 2.
+        #if default_arr(0) exists and var_arr(0) does not exist, set var_arr(0) to $default_arr(0)
+
     } else {
         set output "Unable to compile model. ${err_state} Errors. \n ${err_text}"
         return $output
 
     }
 
-
-
-
 }