From 633efa8bbb37626a6b38865d60285a696ab3c594 Mon Sep 17 00:00:00 2001
From: Xun Li <xunli@asu.edu>
Date: Sun, 8 May 2016 23:19:29 -0700
Subject: [PATCH] #426 create time dummies when saving space-time table

---
 DialogTools/VarGroupingEditorDlg.cpp | 32 ++++++++++++++++++++++------
 SampleData/proj_nat_st.gda           |  4 ----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/DialogTools/VarGroupingEditorDlg.cpp b/DialogTools/VarGroupingEditorDlg.cpp
index bf5a2ffa7..b9e533a64 100644
--- a/DialogTools/VarGroupingEditorDlg.cpp
+++ b/DialogTools/VarGroupingEditorDlg.cpp
@@ -350,18 +350,38 @@ void VarGroupingEditorDlg::OnSaveSpaceTimeTableClick( wxCommandEvent& event )
          */
     }
     
-    if (!time_stack.empty()) {
-        OGRColumn* time_col = new OGRColumnString("TIME", 50, 0, n);
-        time_col->UpdateData(time_stack);
-        mem_table_int->AddOGRColumn(time_col);
-    }
     
     if (!select_stack.empty() && has_highligh) {
         OGRColumn* select_col = new OGRColumnInteger("SELECT", 18, 0, n);
         select_col->UpdateData(select_stack);
         mem_table_int->AddOGRColumn(select_col);
     }
-   
+    
+    if (!time_stack.empty()) {
+        OGRColumn* time_col = new OGRColumnString("TIME", 50, 0, n);
+        time_col->UpdateData(time_stack);
+        mem_table_int->AddOGRColumn(time_col);
+        
+        // add time dummies
+        for (int t=0; t<n_ts; t++) {
+            wxString time_dummy_name = "T_" + tm_strs[t];
+            OGRColumn* time_dummy_col = new OGRColumnInteger(time_dummy_name, 18, 0, n);
+            std::vector<wxInt64> time_dummy_vals;
+            
+            for (int tt=0; tt<n_ts; tt++) {
+                for (int j=0; j<n_obs; j++) {
+                    if ( tt == t) {
+                        time_dummy_vals.push_back(1);
+                    } else {
+                        time_dummy_vals.push_back(0);
+                    }
+                }
+            }
+            time_dummy_col->UpdateData(time_dummy_vals);
+            mem_table_int->AddOGRColumn(time_dummy_col);
+        }
+    }
+
     int n_col = table_int->GetNumberCols();
     for (int i=0; i<n_col; i++) {
         if (table_int->IsColTimeVariant(i)) {
diff --git a/SampleData/proj_nat_st.gda b/SampleData/proj_nat_st.gda
index 297921c8d..d9c8d5cd2 100644
--- a/SampleData/proj_nat_st.gda
+++ b/SampleData/proj_nat_st.gda
@@ -130,10 +130,6 @@
                     <var>FH80</var>
                     <var>FH90</var>
                 </group>
-                <var>LISA_I</var>
-                <var>LISA_CL</var>
-                <var>LISA_P</var>
-                <var>DIFF_VAL</var>
             </variable_order>
             <custom_classifications/>
             <weights_entries>