Merge branch 'v1.18' of https://github.com/lixun910/geoda into v1.18

GeoDaCenter · Dec 11, 2020 · 661b4e0 · 661b4e0
2 parents 88cc7c4 + 5795d05
commit 661b4e0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/Algorithms/rng.h b/Algorithms/rng.h
@@ -74,8 +74,7 @@ class Xoroshiro128Random
 #ifdef __WXOSX__
         return ((unsigned long long)nextLong() >> 11) * 0x1.0p-53;
 #else
-        char tempStr[] = "0x1.0p-53";
-        double nd = std::strtod(tempStr, NULL);
+        double nd = pow(2.0, -53);
         return ((unsigned long long)nextLong() >> 11) * nd;
 #endif
     }

diff --git a/BuildTools/windows/GeoDa.vcxproj b/BuildTools/windows/GeoDa.vcxproj
@@ -482,6 +482,7 @@
     <ClInclude Include="..\..\Algorithms\pam.h" />
     <ClInclude Include="..\..\Algorithms\pca.h" />
     <ClInclude Include="..\..\Algorithms\redcap.h" />
+    <ClInclude Include="..\..\Algorithms\rng.h" />
     <ClInclude Include="..\..\Algorithms\S.h" />
     <ClInclude Include="..\..\Algorithms\skater.h" />
     <ClInclude Include="..\..\Algorithms\smacof.h" />

diff --git a/BuildTools/windows/GeoDa.vcxproj.filters b/BuildTools/windows/GeoDa.vcxproj.filters
@@ -935,6 +935,9 @@
     <ClInclude Include="..\..\Algorithms\azp.h">
       <Filter>Algorithms</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Algorithms\rng.h">
+      <Filter>Algorithms</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\rc\GdaAppResources.cpp">

diff --git a/DialogTools/AZPDlg.cpp b/DialogTools/AZPDlg.cpp
@@ -561,7 +561,7 @@ void AZPDlg::OnOK(wxCommandEvent& event )
     //    initial = value_initial;
     //}
 
-    // Get initial seed e.g LISA clusters
+    // Get initial seed e.g LISA clusters, not used
     std::vector<int> init_regions;
     bool use_init_regions = chk_lisa->GetValue();
     if (use_init_regions) {

diff --git a/GdaShape.cpp b/GdaShape.cpp
@@ -1740,6 +1740,19 @@ void GdaPolyLine::paintSelf(wxDC& dc)
 
 void GdaPolyLine::paintSelf(wxGraphicsContext* gc)
 {
+	if (null_shape) return;
+	gc->SetPen(getPen());
+	gc->SetBrush(getBrush());
+	int nx = getXNudge();
+	int ny = getYNudge();
+	if (n > 1) {
+		wxGraphicsPath path = gc->CreatePath();
+		path.MoveToPoint(points[0].x+nx, points[0].y+ny);
+		for (int i=0, its=n-1; i<its; i++) {
+			path.AddLineToPoint(points[i+1].x+nx, points[i+1].y+ny);
+		}
+		gc->StrokePath(path);
+	} 
 }
 
 wxString GdaPolyLine::printDetails()