refactor: project layout

lvisei · Dec 8, 2020 · ff2546b · ff2546b
1 parent 8a312e8
commit ff2546b
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 14 deletions.
diff --git a/internal/canvas/canvas.go → canvas/canvas.go b/internal/canvas/canvas.go → canvas/canvas.go
diff --git a/internal/canvas/image.go → canvas/image.go b/internal/canvas/image.go → canvas/image.go
diff --git a/data/fonts/source-han-sans-sc/light.ttf b/data/fonts/source-han-sans-sc/light.ttf
diff --git a/data/fonts/source-han-sans-sc/medium.ttf b/data/fonts/source-han-sans-sc/medium.ttf
diff --git a/data/fonts/source-han-sans-sc/regular.ttf b/data/fonts/source-han-sans-sc/regular.ttf
diff --git a/examples/csv/main.go b/examples/csv/main.go
@@ -14,8 +14,8 @@ import (
 
 	"runtime/pprof"
 
-	"github.com/liuvigongzuoshi/go-kriging/internal/canvas"
-	"github.com/liuvigongzuoshi/go-kriging/internal/ordinary"
+	"github.com/liuvigongzuoshi/go-kriging/canvas"
+	"github.com/liuvigongzuoshi/go-kriging/ordinary"
 	"github.com/liuvigongzuoshi/go-kriging/pkg/json"
 )
 
@@ -46,7 +46,7 @@ func main() {
 	}
 	defer timeCost()("训练模型加插值总耗时")
 
-	ordinaryKriging := ordinary.NewOrdinary(data["values"], data["lons"], data["lats"])
+	ordinaryKriging := ordinary.NewOrdinary(data["values"], data["x"], data["y"])
 	_ = ordinaryKriging.Train(ordinary.Spherical, 0, 100)
 
 	gridPlot(ordinaryKriging, polygon)
@@ -72,7 +72,7 @@ func gridPlot(ordinaryKriging *ordinary.Variogram, polygon ordinary.PolygonCoord
 
 	subTitle := &canvas.TextConfig{
 		Text:     "球面半变异函数模型",
-		FontName: "data/fonts/source-han-sans-sc/regular.ttf",
+		FontName: "testdata/fonts/source-han-sans-sc/regular.ttf",
 		FontSize: 28,
 		Color:    color.RGBA{R: 0, G: 0, B: 0, A: 255},
 		OffsetX:  252,
@@ -156,7 +156,7 @@ func readCsvFile(filePath string) (map[string][]float64, error) {
 		values = append(values, value)
 	}
 
-	data := map[string][]float64{"values": values, "lats": lats, "lons": lons}
+	data := map[string][]float64{"values": values, "x": lons, "y": lats}
 
 	//fmt.Printf("values %#v\n lons %#v\n lats %#v\n", values, lons, lats)
 

diff --git a/examples/wasm/main.go b/examples/wasm/main.go
@@ -7,7 +7,7 @@ import (
 
 	"syscall/js"
 
-	"github.com/liuvigongzuoshi/go-kriging/internal/ordinary"
+	"github.com/liuvigongzuoshi/go-kriging/ordinary"
 )
 
 func main() {

diff --git a/internal/ordinary/example_test.go → ordinary/example_test.go b/internal/ordinary/example_test.go → ordinary/example_test.go
@@ -3,7 +3,7 @@ package ordinary_test
 import (
 	"fmt"
 
-	"github.com/liuvigongzuoshi/go-kriging/internal/ordinary"
+	"github.com/liuvigongzuoshi/go-kriging/ordinary"
 )
 
 var (

diff --git a/internal/ordinary/math.go → ordinary/math.go b/internal/ordinary/math.go → ordinary/math.go
diff --git a/internal/ordinary/matrix.go → ordinary/matrix.go b/internal/ordinary/matrix.go → ordinary/matrix.go
diff --git a/internal/ordinary/ordinary.go → ordinary/ordinary.go b/internal/ordinary/ordinary.go → ordinary/ordinary.go
@@ -10,7 +10,7 @@ import (
 	"math"
 	"sort"
 
-	"github.com/liuvigongzuoshi/go-kriging/internal/canvas"
+	"github.com/liuvigongzuoshi/go-kriging/canvas"
 )
 
 // Variogram ordinary kriging variogram

diff --git a/internal/ordinary/ordinary_test.go → ordinary/ordinary_test.go b/internal/ordinary/ordinary_test.go → ordinary/ordinary_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/liuvigongzuoshi/go-kriging/internal/ordinary"
+	"github.com/liuvigongzuoshi/go-kriging/ordinary"
 )
 
 const pngDirPath = "testdata"

diff --git a/internal/ordinary/parallel.go → ordinary/parallel.go b/internal/ordinary/parallel.go → ordinary/parallel.go
diff --git a/internal/ordinary/type.go → ordinary/type.go b/internal/ordinary/type.go → ordinary/type.go
@@ -75,8 +75,8 @@ type ContourRectangle struct {
 type PolygonCoordinates [][][2]float64
 
 type PolygonGeometry struct {
-	Type        string             `json:"type"`
-	Coordinates PolygonCoordinates `json:"coordinates,omitempty"`
+	Type        string             `json:"type"`                  // Polygon
+	Coordinates PolygonCoordinates `json:"coordinates,omitempty"` // coordinates
 }
 
 type RGBA [4]uint8
@@ -94,7 +94,6 @@ func (c RGBA) RGBA() (r, g, b, a uint32) {
 }
 
 type GridLevelColor struct {
-	Value [2]float64 `json:"value"`
-
-	Color RGBA `json:"color"`
+	Value [2]float64 `json:"value"` // [0, 5]
+	Color RGBA       `json:"color"` // [255, 255, 255, 255]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ package ordinary_test @@
     import (
     	"fmt"
-    	"github.com/liuvigongzuoshi/go-kriging/internal/ordinary"
+    	"github.com/liuvigongzuoshi/go-kriging/ordinary"
     )
     var (
@@ Expand Down @@