Added/Changed tests

Changed or added the fallowing tests
TestPortal2Galactic:
	P2gc("41EDF9554C2F")

TestGalactic2portal:
	Gc2p("042F:0079:0D55:006A", 1)
	Gc2p("042E:0078:0D53:01ED", 4)

TestKorvax2Eng:
	Korvax2Eng("rodiashikhv")
	Korvax2Eng("KIHTYOMOLES")
	Korvax2Eng("Zelidovoso")
	Eng2Korvax("contraband")
	Eng2Korvax("CONTRABAND")
	Eng2Korvax("Contraband")

convert.go

@@ -70,22 +70,23 @@ func P2gc(p string) (gc string, err error) {
 
 /*
 Gc2p - Galactic coordinates to portal code
-Requires 1 string and returns a string and error
+Requires 1 string and 1 int returns a string and error
 	var gc string
 		Galactic address (ex. 042F:0079:0D55:006A)
+	var p int
+		Planet ID [1-6]
 	Return var string
 		Portal Glyph hex string 12 chars in len (ex. 006afa556c30)
 */
-func Gc2p(gc string) (portalcode string, err error) {
+func Gc2p(gc string, p int) (portalcode string, err error) {
-	if err != nil {
-		panic(err)
-	}
-
-	/*TODO: add option for Planet choice (1-6)*/
 	// split and store string
 	// coords[0] == X; coords[1] == Y coords[2] == Z;
 	// coords[3] == SSI coords[4] == P
-	coords := strings.Split(gc+":1", ":")
+	if p > 6 {
+		p = 1
+	}
+	nustring := fmt.Sprintf("%s:%d", gc, p)
+	coords := strings.Split(nustring, ":")
 	for n := 0; n < len(coords); n++ {
 		portalcode = portalcode + coords[n]
 	}

glyphbanner.go

@@ -7,6 +7,8 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/nfnt/resize"
+
 	gim "github.com/ozankasikci/go-image-merge"
 )
 
@@ -24,6 +26,8 @@ func CreateBanner(portalhex string, savename string, vopt int) {
 	var err error
 	var GlyphHex [12]int64
 	var glyphImg [12]string
+	var vert int
+	var horz int
 
 	// Setup temp dir
 	tempdir, err := ioutil.TempDir("", "nmslib-")
@@ -71,25 +75,27 @@ func CreateBanner(portalhex string, savename string, vopt int) {
 		{ImageFilePath: tempdir + "/" + glyphImg[8]}, {ImageFilePath: tempdir + "/" + glyphImg[9]},
 		{ImageFilePath: tempdir + "/" + glyphImg[10]}, {ImageFilePath: tempdir + "/" + glyphImg[11]},
 	}
-	if vopt == 1 {
+
-		// Merge images horizontally
+	if vopt == 1 { // set vertical rendering
-		rgba, err := gim.New(grids, 1, 12).Merge()
+		vert, horz = 1, 12
-		if err != nil {
+	} else { // set horizontal rendering (default)
-			panic(err)
+		vert, horz = 12, 1
-		}
+	}
-		// save the output to png
+
-		fmt.Printf("Saving %s to %s in vertical format\n", portalhex, savename)
+	// create new image from grids
-		file, err := os.Create(savename)
+	rgba, err := gim.New(grids, vert, horz).Merge()
-		err = png.Encode(file, rgba)
+	if err != nil {
-	} else {
+		panic(err)
-		// Merge images vertically
+	}
-		rgba, err := gim.New(grids, 12, 1).Merge()
+
-		if err != nil {
+	// Resize banner 768x64
-			panic(err)
+	nuimg := resize.Resize(768, 64, rgba, resize.Lanczos3)
-		}
+
-		// save the output to png
+	// save the output to png
-		fmt.Printf("Saving %s to %s\n", portalhex, savename)
+	fmt.Printf("Saving %s to %s\n", portalhex, savename)
-		file, err := os.Create(savename)
+	file, err := os.Create(savename)
-		err = png.Encode(file, rgba)
+	err = png.Encode(file, nuimg)
+	if err != nil {
+		fmt.Println(err)
 	}
 }

go.mod

@@ -2,4 +2,7 @@ module gitlab.com/bradley.richins/nmslib
 
 go 1.15
 
-require github.com/ozankasikci/go-image-merge v0.2.2
+require (
+	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
+	github.com/ozankasikci/go-image-merge v0.2.2
+)

go.sum

@@ -1,2 +1,4 @@
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/ozankasikci/go-image-merge v0.2.2 h1:K370BLLTIsamwjAeViiPntf7GiG3h9pXzDmxXCbN8/0=
 github.com/ozankasikci/go-image-merge v0.2.2/go.mod h1:NQ2aN0b21buFx3p+5x4dZrKuPSLh2uBukK7F30BrYTo=

lang.go

@@ -8,51 +8,56 @@ import (
 	"strings"
 )
 
-// KorvaxWord - set up structure of a word iteration
+// translate - set up structure of a word iteration
-type korvaxWord struct {
+type translate struct {
-	english   string
+	english string // english word
-	korvax    string
+	word    string // no caps word
-	kwcaps    string
+	capword string // Capitalized word
-	kwallcaps string
+	acpword string // ALL CAPITALIZED WORD
 }
 
 /*
 Korvax2Eng - Translate a Korvax word to English
 */
 func Korvax2Eng(kvwrd string) string {
+	// create temp dir
 	tempdir, err := ioutil.TempDir("", "nmslib-")
 	if err != nil {
 		panic(err)
 	}
-	defer os.RemoveAll(tempdir)
+	defer os.RemoveAll(tempdir) // Clean up temp files
 
+	// extract language file from resources.go
 	data, err := Asset("korvax-lang.csv")
 	if err != nil {
 		panic(err)
 	}
+	// wirte extracted data to temp dir
 	err = ioutil.WriteFile(tempdir+"/korvax-lang.csv", []byte(data), 0644)
 	csvFile, err := os.Open(tempdir + "/korvax-lang.csv")
 	if err != nil {
 		fmt.Println(err)
 	}
-	defer csvFile.Close()
+	defer csvFile.Close() // close language file when finished
 	csvlines, err := csv.NewReader(csvFile).ReadAll()
 	if err != nil {
 		fmt.Println(err)
 	}
+	// loop through language data and assign to translate strut
 	for _, line := range csvlines {
-		klang := korvaxWord{
+		lang := translate{
-			english:   line[0],
+			english: strings.ToLower(line[0]),
-			korvax:    line[1],
+			word:    strings.ToLower(line[1]),
-			kwcaps:    line[2],
+			capword: strings.ToLower(line[2]),
-			kwallcaps: line[3],
+			acpword: strings.ToLower(line[3]),
 		}
-		if kvwrd == klang.korvax {
+		// check translate struct for value
-			return klang.english
+		if strings.ToLower(kvwrd) == lang.word {
-		} else if kvwrd == klang.korvax {
+			return lang.english
-			return strings.Title(strings.ToLower(klang.english))
+		} else if strings.ToLower(kvwrd) == lang.capword {
-		} else if kvwrd == klang.kwallcaps {
+			return strings.Title(strings.ToLower(lang.english))
-			return strings.ToUpper(klang.english)
+		} else if strings.ToLower(kvwrd) == lang.acpword {
+			return strings.ToUpper(lang.english)
 		}
 	}
 	return "*\\Kzzzzzzt\\*" // word not found default
@@ -62,11 +67,12 @@ func Korvax2Eng(kvwrd string) string {
 Eng2Korvax - Convert (some) english words to Korvax
 */
 func Eng2Korvax(enwrd string) string {
+	// setup temp dir
 	tempdir, err := ioutil.TempDir("", "nmslib")
 	if err != nil {
 		panic(err)
 	}
-	defer os.RemoveAll(tempdir)
+	defer os.RemoveAll(tempdir) // clean up temp files
 
 	data, err := Asset("korvax-lang.csv")
 	if err != nil {
@@ -77,21 +83,33 @@ func Eng2Korvax(enwrd string) string {
 	if err != nil {
 		fmt.Println(err)
 	}
-	defer csvFile.Close()
 	csvlines, err := csv.NewReader(csvFile).ReadAll()
 	if err != nil {
 		fmt.Println(err)
 	}
 	for _, line := range csvlines {
-		klang := korvaxWord{
+		lang := translate{
-			english:   line[0],
+			english: line[0],
-			korvax:    line[1],
+			word:    line[1],
-			kwcaps:    line[2],
+			capword: line[2],
-			kwallcaps: line[3],
+			acpword: line[3],
 		}
-		if enwrd == klang.english {
+		if enwrd == lang.english {
-			return klang.korvax
+			if lang.word != "" {
+				return lang.word
+			}
+		}
+		if enwrd == strings.Title(strings.ToLower(lang.english)) {
+			if lang.capword != "" {
+				return strings.Title(strings.ToLower(lang.capword))
+			}
+		}
+		if enwrd == strings.ToUpper(lang.english) {
+			if lang.acpword != "" {
+				return strings.ToUpper(lang.acpword)
+			}
 		}
 	}
+	csvFile.Close()
 	return "*\\Kzzzzzzt\\*" // word not found default
 }

nmslib_test.go

@@ -15,10 +15,20 @@ func TestPortal2Galactic(t *testing.T) {
 	} else {
 		fmt.Printf("Testing P2gc(\"006afa556c30\"): got: %q, want: %q.\n", want, "042F:0079:0D55:006A")
 	}
+
+	want, err = P2gc("41EDF9554C2F")
+	if err != nil {
+		panic(err)
+	}
+	if want != "042E:0078:0D53:01ED" {
+		t.Errorf("Testing P2gc(\"41EDF9554C2F\"): got %q, want: %q.\n", want, "042E:0078:0D53:01ED")
+	} else {
+		fmt.Printf("Testing P2gc(\"41EDF9554C2F\"): got: %q, want: %q.\n", want, "042E:0078:0D53:01ED")
+	}
 }
 
 func TestGalactic2portal(t *testing.T) {
-	want, err := Gc2p("042F:0079:0D55:006A")
+	want, err := Gc2p("042F:0079:0D55:006A", 1)
 	if err != nil {
 		panic(err)
 	}
@@ -28,14 +38,14 @@ func TestGalactic2portal(t *testing.T) {
 		fmt.Printf("Testing Gc2p(\"042F:0079:0D55:006A\"): got: %q, want: %q.\n", want, "106AFA556C30")
 	}
 
-	want, err = Gc2p("044B:0081:0D68:0096")
+	want, err = Gc2p("042E:0078:0D53:01ED", 4)
 	if err != nil {
 		panic(err)
 	}
-	if want != "109602569C4C" {
+	if want != "41EDF9554C2F" {
-		t.Errorf("Testing Gc2p(\"044B:0081:0D68:0096\"): got %q, want: %q.\n", want, "109602569C4C")
+		t.Errorf("Testing Gc2p(\"042E:0078:0D53:01ED\"): got %q, want: %q.\n", want, "41EDF9554C2F")
 	} else {
-		fmt.Printf("Testing Gc2p(\"044B:0081:0D68:0096\"): got: %q, want: %q.\n", want, "109602569C4C")
+		fmt.Printf("Testing Gc2p(\"042E:0078:0D53:01ED\"): got: %q, want: %q.\n", want, "41EDF9554C2F")
 	}
 }
 
@@ -45,11 +55,25 @@ func TestCreateBanner(t *testing.T) {
 }
 
 func TestKorvax2Eng(t *testing.T) {
-	want := Korvax2Eng("eapoluch")
+	want := Korvax2Eng("rodiashikhv")
-	if want != "emergency" {
+	if want != "contraband" {
-		t.Errorf("Testing Korvax2eng(\"eapoluch\"): got %q, want: %q.\n", want, "emergency")
+		t.Errorf("Testing Korvax2eng(\"rodiashikhv\"): got %q, want: %q.\n", want, "contraband")
 	} else {
-		fmt.Printf("Testing Korvax2eng(\"eapoluch\"): got %q, want: %q.\n", want, "emergency")
+		fmt.Printf("Testing Korvax2eng(\"rodiashikhv\"): got %q, want: %q.\n", want, "contraband")
+	}
+
+	want = Korvax2Eng("KIHTYOMOLES")
+	if want != "CONTRABAND" {
+		t.Errorf("Testing Korvax2eng(\"KIHTYOMOLES\"): got %q, want: %q.\n", want, "CONTRABAND")
+	} else {
+		fmt.Printf("Testing Korvax2eng(\"KIHTYOMOLES\"): got %q, want: %q.\n", want, "CONTRABAND")
+	}
+
+	want = Korvax2Eng("Zelidovoso")
+	if want != "Contraband" {
+		t.Errorf("Testing Korvax2eng(\"Zelidovoso\"): got %q, want: %q.\n", want, "Contraband")
+	} else {
+		fmt.Printf("Testing Korvax2eng(\"Zelidovoso\"): got %q, want: %q.\n", want, "Contraband")
 	}
 
 	want = Korvax2Eng("notaword")
@@ -61,11 +85,25 @@ func TestKorvax2Eng(t *testing.T) {
 }
 
 func TestEng2Korvax(t *testing.T) {
-	want := Eng2Korvax("emergency")
+	want := Eng2Korvax("contraband")
-	if want != "eapoluch" {
+	if want != "rodiashikhv" {
-		t.Errorf("Testing Eng2Korvax(\"emergency\"): got %q, want: %q.\n", want, "eapoluch")
+		t.Errorf("Testing Eng2Korvax(\"contraband\"): got %q, want: %q.\n", want, "rodiashikhv")
 	} else {
-		fmt.Printf("Testing Eng2Korvax(\"emergency\"): got %q, want: %q.\n", want, "eapoluch")
+		fmt.Printf("Testing Eng2Korvax(\"contraband\"): got %q, want: %q.\n", want, "rodiashikhv")
+	}
+
+	want = Eng2Korvax("CONTRABAND")
+	if want != "KIHTYOMOLES" {
+		t.Errorf("Testing Eng2Korvax(\"CONTRABAND\"): got %q, want: %q.\n", want, "KIHTYOMOLES")
+	} else {
+		fmt.Printf("Testing Eng2Korvax(\"CONTRABAND\"): got %q, want: %q.\n", want, "KIHTYOMOLES")
+	}
+
+	want = Eng2Korvax("Contraband")
+	if want != "Zelidovoso" {
+		t.Errorf("Testing Eng2Korvax(\"Contraband\"): got %q, want: %q.\n", want, "Zelidovoso")
+	} else {
+		fmt.Printf("Testing Eng2Korvax(\"Contraband\"): got %q, want: %q.\n", want, "Zelidovoso")
 	}
 
 	want = Eng2Korvax("notaword")
@@ -74,5 +112,6 @@ func TestEng2Korvax(t *testing.T) {
 	} else {
 		fmt.Printf("Testing Eng2Korvax(\"notaword\"): got %q, want: %q.\n", want, "*\\Kzzzzzzt\\*")
 	}
+
 	fmt.Printf("Testing: ")
 }