#426 create time dummies when saving space-time table

GeoDaCenter · May 9, 2016 · 633efa8 · 633efa8
1 parent 3433cf0
commit 633efa8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git 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
@@ -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>