Merge pull request #9 from jsmorph/packaging

timbray · web-flow · commit b943b84ed735 · 2022-05-25T09:49:26.000-07:00
Package reorg; closes #5; see #6
diff --git a/core/arrays_test.go b/core/arrays_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"testing"
diff --git a/core/benchmarks_test.go b/core/benchmarks_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"bufio"
@@ -53,7 +53,7 @@ const thresholdPerformance = 120000.0
 //  that it uses geometry/co-ordintes, which will force the fj flattener to process the big arrays of numbers in
 //  each line.  A high proportion of typical Quamina workloads should run faster.
 func TestCityLots(t *testing.T) {
-	file, err := os.Open("../test_data/citylots.jlines")
+	file, err := os.Open("../testdata/citylots.jlines")
 	if err != nil {
 		t.Error("Can't open file: " + err.Error())
 	}
@@ -183,7 +183,7 @@ func TestMySoftwareHatesMe(t *testing.T) {
 
 // exercise shellstyle matching a little, is much faster than TestCityLots because it's only working wth one field
 func TestBigShellStyle(t *testing.T) {
-	file, err := os.Open("../test_data/citylots.jlines")
+	file, err := os.Open("../testdata/citylots.jlines")
 	if err != nil {
 		t.Error("Can't open file: " + err.Error())
 	}
@@ -326,7 +326,7 @@ func (w *worder) next() []byte {
 
 func readWWords(t *testing.T) [][]byte {
 	// that's a list from the Wordle source code with a few erased to get a prime number
-	file, err := os.Open("../test_data/wwords.txt")
+	file, err := os.Open("../testdata/wwords.txt")
 	if err != nil {
 		t.Error("Can't open file: " + err.Error())
 	}
diff --git a/core/concurrency_test.go b/core/concurrency_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"bufio"
@@ -39,7 +39,7 @@ func TestConcurrency(t *testing.T) {
 	// I was initially surprised that adding 860 or so changes to the automaton while it's running doesn't seem to
 	//  cause any decrease in performance. But I guess it splits out very cleanly onto another core and really
 	//  doesn't steal any resources from the thread doing the Match calls
-	file, err := os.Open("../test_data/citylots.jlines")
+	file, err := os.Open("../testdata/citylots.jlines")
 	if err != nil {
 		t.Error("Can't open file: " + err.Error())
 	}
diff --git a/core/core_matcher.go b/core/core_matcher.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 // CoreMatcher represents an automaton that allows matching sequences of name/value field pairs against
 //  patterns, which are combinations of field names and lists of allowed valued field values.
diff --git a/core/core_matcher_test.go b/core/core_matcher_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"fmt"
diff --git a/core/escaping_test.go b/core/escaping_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"testing"
diff --git a/core/field_matcher.go b/core/field_matcher.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 // fieldMatcher represents a state in the matching automaton, which matches field names and dispatches to
 //  valueMatcher to complete matching of name/value combinations.  fieldMatcher has a map which is keyed by the
diff --git a/core/fj.go b/core/fj.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"errors"
diff --git a/core/fj_test.go b/core/fj_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"io/ioutil"
@@ -58,7 +58,7 @@ func TestFJBasic(t *testing.T) {
 func TestFJ10Lines(t *testing.T) {
 
 	geo := fakeMatcher("type", "geometry")
-	testTrackerSelection(NewFJ(geo), "L0", "../test_data/cl-sample-0",
+	testTrackerSelection(NewFJ(geo), "L0", "../testdata/cl-sample-0",
 		[]string{"type", "geometry\ntype"},
 		[]string{`"Feature"`, `"Polygon"`},
 		t)
@@ -99,13 +99,13 @@ func TestFJ10Lines(t *testing.T) {
 	}
 
 	coords := fakeMatcher("coordinates", "geometry")
-	testTrackerSelection(NewFJ(coords), "L1", "../test_data/cl-sample-1",
+	testTrackerSelection(NewFJ(coords), "L1", "../testdata/cl-sample-1",
 		coordNames, coordVals, t)
 
 	l2names := []string{"properties\nFROM_ST", "properties\nODD_EVEN"}
 	l2vals := []string{`"1917"`, `"O"`}
 	proFoOd := fakeMatcher("properties", "FROM_ST", "ODD_EVEN")
-	testTrackerSelection(NewFJ(proFoOd), "L2", "../test_data/cl-sample-2",
+	testTrackerSelection(NewFJ(proFoOd), "L2", "../testdata/cl-sample-2",
 		l2names, l2vals, t)
 }
 
diff --git a/core/flattener.go b/core/flattener.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 type ArrayPos struct {
 	Array int32
diff --git a/core/list_maker.go b/core/list_maker.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 // this needs to exist so that all all the lists containing a single step to X, or the triple step to X,Y,Z are the
 //  same list, so that pack/unpack work properly
diff --git a/core/list_maker_test.go b/core/list_maker_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"testing"
diff --git a/core/match_set.go b/core/match_set.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 // matchSet is what it says on the tin; implements a set semantic on matches, which are of type X. These could all
 //  be implemented as match[X]bool but this makes the calling code more readable.
diff --git a/core/matcher.go b/core/matcher.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 type Matcher interface {
 	AddPattern(x X, pat string) error
diff --git a/core/matcher_test.go b/core/matcher_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import "testing"
 
diff --git a/core/name_tracker.go b/core/name_tracker.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 type NameTracker interface {
 	IsNameUsed(label []byte) bool
diff --git a/core/numbers.go b/core/numbers.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"errors"
diff --git a/core/numbers_test.go b/core/numbers_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"fmt"
diff --git a/core/pattern.go b/core/pattern.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"bytes"
diff --git a/core/pattern_test.go b/core/pattern_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"testing"
diff --git a/core/shell_style.go b/core/shell_style.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"encoding/json"
diff --git a/core/shell_style_test.go b/core/shell_style_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"bufio"
@@ -161,7 +161,7 @@ func TestMixedPatterns(t *testing.T) {
 		}
 	}
 	got := make(map[X]int)
-	file, err := os.Open("../test_data/citylots.jlines")
+	file, err := os.Open("../testdata/citylots.jlines")
 	if err != nil {
 		t.Error("Can't open file: " + err.Error())
 	}
diff --git a/core/small_table.go b/core/small_table.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 // dfaStep and nfaStep are used by the valueMatcher automaton - every step through the
 //  automaton requires a smallTable and for some of them, taking the step means you've matched a value and can
diff --git a/core/small_table_test.go b/core/small_table_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"math/rand"
diff --git a/core/stats.go b/core/stats.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import "fmt"
 
diff --git a/core/value_matcher.go b/core/value_matcher.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"bytes"
diff --git a/core/value_matcher_test.go b/core/value_matcher_test.go
@@ -1,4 +1,4 @@
-package quamina
+package core
 
 import (
 	"fmt"
diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
-module quamina
+module github.com/timbray/quamina
 
 go 1.18
diff --git a/go.sum b/go.sum
diff --git a/pruner/pruner.go b/pruner/pruner.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	quamina "quamina/lib"
+	quamina "github.com/timbray/quamina/core"
 )
 
 // Stats reports basic counts to aid in deciding when to Rebuild.
diff --git a/pruner/pruner_test.go b/pruner/pruner_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	quamina "quamina/lib"
+	quamina "github.com/timbray/quamina/core"
 )
 
 var verbose = false
@@ -456,7 +456,7 @@ func BenchmarkCityLotsPruner(b *testing.B) {
 func benchmarkCityLots(b *testing.B, m quamina.Matcher) {
 
 	oneMeg := 1024 * 1024
-	file, err := os.Open("../test_data/citylots.jlines")
+	file, err := os.Open("../testdata/citylots.jlines")
 	if err != nil {
 		b.Errorf("Can't open file %s", err)
 	}
diff --git a/pruner/state.go b/pruner/state.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	quamina "quamina/lib"
+	quamina "github.com/timbray/quamina/core"
 )
 
 // LivePatternsState represents the required capabilities for
diff --git a/pruner/state_test.go b/pruner/state_test.go
@@ -2,8 +2,9 @@ package pruner
 
 import (
 	"fmt"
-	quamina "quamina/lib"
 	"testing"
+
+	quamina "github.com/timbray/quamina/core"
 )
 
 func TestMemIterateFerr(t *testing.T) {
diff --git a/testdata/citylots.jlines b/testdata/citylots.jlines
diff --git a/testdata/cl-sample-0 b/testdata/cl-sample-0
diff --git a/testdata/cl-sample-1 b/testdata/cl-sample-1
diff --git a/testdata/cl-sample-2 b/testdata/cl-sample-2
diff --git a/testdata/wwords.txt b/testdata/wwords.txt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package quamina`
	`1`	`+package core`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"testing"`