From 5c8b1ccb1665aed42305860326fa73fc659c9335 Mon Sep 17 00:00:00 2001 From: Xun Li Date: Tue, 20 Oct 2020 14:26:34 -0700 Subject: [PATCH] #2242 add check for non-colocation and colocation join count --- GeoDa.cpp | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/GeoDa.cpp b/GeoDa.cpp index e4d6690ba..1e8abcdeb 100644 --- a/GeoDa.cpp +++ b/GeoDa.cpp @@ -4256,20 +4256,23 @@ void GdaFrame::OnOpenBivariateLJC(wxCommandEvent& event) } // check if binary data - std::vector data; + std::vector data1, data2; + std::vector undef_data1, undef_data2; TableInterface* table_int = p->GetTableInt(); - table_int->GetColData(VS.col_ids[0], VS.var_info[0].time, data); - for (int i=0; iGetColData(VS.col_ids[0], VS.var_info[0].time, data1); + table_int->GetColUndefined(VS.col_ids[0], VS.var_info[0].time, undef_data1); + for (int i=0; iGetColData(VS.col_ids[1], VS.var_info[1].time, data); - for (int i=0; iGetColData(VS.col_ids[1], VS.var_info[1].time, data2); + table_int->GetColUndefined(VS.col_ids[1], VS.var_info[1].time, undef_data2); + for (int i=0; iGetNumRecords(); + + vector undefs; + for (int i=0; i 2) { + if (num_vars >= 2) { std::vector data(num_vars); // data[variable][time][obs] std::vector undef_data(num_vars); for (int i=0; i