#566 LocalG include neighbors with undefined values as neighbors

GeoDaCenter · Jan 25, 2017 · 743da57 · 743da57
1 parent f4167a4
commit 743da57
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Explore/GStatCoordinator.cpp b/Explore/GStatCoordinator.cpp
@@ -238,6 +238,7 @@ void GStatCoordinator::AllocateVectors()
 
     x_undefs.resize(tms);
     Gal_vecs.resize(tms);
+    Gal_vecs_orig.resize(tms);
 
 
 	n.resize(tms, 0);
@@ -325,6 +326,7 @@ void GStatCoordinator::InitFromVarInfo()
             }
             W = gw->gal ;
             Gal_vecs[t] = gw;
+            Gal_vecs_orig[t] = w_man_int->GetGal(w_id);
         }
 
 		x = x_vecs[t];

diff --git a/Explore/GStatCoordinator.h b/Explore/GStatCoordinator.h
@@ -156,6 +156,7 @@ class GStatCoordinator : public WeightsManStateObserver
 
 	boost::uuids::uuid w_id;
     std::vector<GalWeight*> Gal_vecs;
+    std::vector<GalWeight*> Gal_vecs_orig;
 	wxString weight_name;
 
 	int num_obs; // total # obs including neighborless obs

diff --git a/version.h b/version.h
@@ -2,10 +2,10 @@ namespace Gda {
 	const int version_major = 1;
 	const int version_minor = 8;
 	const int version_build = 15;
-	const int version_subbuild = 15;
+	const int version_subbuild = 17;
 	const int version_year = 2017;
 	const int version_month = 1;
-	const int version_day = 24;
+	const int version_day = 25;
 	const int version_night = 0;
 	const int version_type = 2; // 0: alpha, 1: beta, 2: release
 }