From 7df42b8238933a8f694153a91e6efdd416f3b70b Mon Sep 17 00:00:00 2001
From: "Andrew E. Torda" <torda@zbh.uni-hamburg.de>
Date: Thu, 20 Jan 2022 13:05:53 +0100
Subject: [PATCH] Big renaming and go.mod organising. Now the tests seem to be
broken.
---
{ackwork/ackley => ackley}/ackley.go | 0
{ackwork/ackley => ackley}/ackley_test.go | 3 ++-
ackley/go.mod | 3 +++
{ackwork/ackley => ackley}/notes | 0
go.mod | 9 +++++----
go.sum | 4 ++--
main.go | 4 ++--
{ackwork => mc_work}/ToDo | 0
{ackwork => mc_work}/dorun.go | 4 ++--
{ackwork => mc_work}/export_test.go | 2 +-
mc_work/go.mod | 11 +++++++++++
mc_work/go.sum | 9 +++++++++
ackwork/ackwork.go => mc_work/mc_work.go | 5 +++--
ackwork/ackwork_test.go => mc_work/mc_work_test.go | 4 ++--
{ackwork => mc_work}/plot.go | 2 +-
{ackwork => mc_work}/plotres.r | 0
{ackwork => mc_work}/rdprm.go | 2 +-
{ackwork => mc_work}/set_suffix.go | 2 +-
nothing_test.go | 13 +++++++++++++
19 files changed, 58 insertions(+), 19 deletions(-)
rename {ackwork/ackley => ackley}/ackley.go (100%)
rename {ackwork/ackley => ackley}/ackley_test.go (99%)
create mode 100644 ackley/go.mod
rename {ackwork/ackley => ackley}/notes (100%)
rename {ackwork => mc_work}/ToDo (100%)
rename {ackwork => mc_work}/dorun.go (99%)
rename {ackwork => mc_work}/export_test.go (78%)
create mode 100644 mc_work/go.mod
create mode 100644 mc_work/go.sum
rename ackwork/ackwork.go => mc_work/mc_work.go (97%)
rename ackwork/ackwork_test.go => mc_work/mc_work_test.go (97%)
rename {ackwork => mc_work}/plot.go (99%)
rename {ackwork => mc_work}/plotres.r (100%)
rename {ackwork => mc_work}/rdprm.go (99%)
rename {ackwork => mc_work}/set_suffix.go (98%)
create mode 100644 nothing_test.go
diff --git a/ackwork/ackley/ackley.go b/ackley/ackley.go
similarity index 100%
rename from ackwork/ackley/ackley.go
rename to ackley/ackley.go
diff --git a/ackwork/ackley/ackley_test.go b/ackley/ackley_test.go
similarity index 99%
rename from ackwork/ackley/ackley_test.go
rename to ackley/ackley_test.go
index 46b3e2c..af9f28a 100644
--- a/ackwork/ackley/ackley_test.go
+++ b/ackley/ackley_test.go
@@ -5,11 +5,12 @@
package ackley_test
import (
- . "ackley"
"fmt"
"io"
"os"
"testing"
+
+ . "ackley"
)
// A gridsize has a min and max and the number of increments between
diff --git a/ackley/go.mod b/ackley/go.mod
new file mode 100644
index 0000000..23b2f23
--- /dev/null
+++ b/ackley/go.mod
@@ -0,0 +1,3 @@
+module ackley
+
+go 1.16
diff --git a/ackwork/ackley/notes b/ackley/notes
similarity index 100%
rename from ackwork/ackley/notes
rename to ackley/notes
diff --git a/go.mod b/go.mod
index b3e69c3..8cbf461 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,8 @@ module ackley_mc
go 1.16
-require (
- github.com/wcharczuk/go-chart/v2 v2.1.0
- gitlab.rrz.uni-hamburg.de/Bae5157/axticks v0.0.0-20211227145643-dc5ef95d7dad
-)
+require mc_work v0.0.0-00010101000000-000000000000
+
+replace ackley => ./ackley
+
+replace mc_work => ./mc_work
diff --git a/go.sum b/go.sum
index 520af54..55fb9bb 100644
--- a/go.sum
+++ b/go.sum
@@ -2,8 +2,8 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF0
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
-gitlab.rrz.uni-hamburg.de/Bae5157/axticks v0.0.0-20211227145643-dc5ef95d7dad h1:IBCLghidSwZff0/3RuvTLDnHgK9SaZHZ/cXWSjimEt0=
-gitlab.rrz.uni-hamburg.de/Bae5157/axticks v0.0.0-20211227145643-dc5ef95d7dad/go.mod h1:5CNHyqeidRypmIVTnQksGqnmP56Oshw1Zv1nlUezrpQ=
+gitlab.rrz.uni-hamburg.de/Bae5157/axticks v0.0.0-20220120103412-d663ebb46145 h1:02TpLZVj21Xg5OAKHE6vs+bJRlmyuQk4uphZXvDr/w0=
+gitlab.rrz.uni-hamburg.de/Bae5157/axticks v0.0.0-20220120103412-d663ebb46145/go.mod h1:5CNHyqeidRypmIVTnQksGqnmP56Oshw1Zv1nlUezrpQ=
golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM=
golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/main.go b/main.go
index 0eb00a0..007590f 100644
--- a/main.go
+++ b/main.go
@@ -11,7 +11,7 @@ package main
import (
"fmt"
"os"
- "ackley_mc/ackwork"
+ "mc_work"
)
const (
@@ -20,7 +20,7 @@ const (
)
func main() {
- if err := ackwork.MyMain (); err != nil {
+ if err := mc_work.MyMain (); err != nil {
fmt.Fprintln (os.Stderr, err)
os.Exit (exitFailure)
}
diff --git a/ackwork/ToDo b/mc_work/ToDo
similarity index 100%
rename from ackwork/ToDo
rename to mc_work/ToDo
diff --git a/ackwork/dorun.go b/mc_work/dorun.go
similarity index 99%
rename from ackwork/dorun.go
rename to mc_work/dorun.go
index d006e90..0e27dd1 100644
--- a/ackwork/dorun.go
+++ b/mc_work/dorun.go
@@ -1,5 +1,5 @@
// Aug 2021
-package ackwork
+package mc_work
import (
"bufio"
@@ -10,7 +10,7 @@ import (
"os"
"sync"
- "ackley_mc/ackwork/ackley"
+ "ackley"
)
const (
diff --git a/ackwork/export_test.go b/mc_work/export_test.go
similarity index 78%
rename from ackwork/export_test.go
rename to mc_work/export_test.go
index f880423..2d4bddf 100644
--- a/ackwork/export_test.go
+++ b/mc_work/export_test.go
@@ -1,4 +1,4 @@
-package ackwork
+package mc_work
var SetSuffix = setSuffix
var RemoveQuotes = removeQuotes
diff --git a/mc_work/go.mod b/mc_work/go.mod
new file mode 100644
index 0000000..493da9b
--- /dev/null
+++ b/mc_work/go.mod
@@ -0,0 +1,11 @@
+module mc_work
+
+go 1.16
+
+require (
+ ackley v0.0.0-00010101000000-000000000000
+ github.com/wcharczuk/go-chart/v2 v2.1.0
+ gitlab.rrz.uni-hamburg.de/Bae5157/axticks v0.0.0-20220120103412-d663ebb46145
+)
+
+replace ackley => ../ackley
diff --git a/mc_work/go.sum b/mc_work/go.sum
new file mode 100644
index 0000000..55fb9bb
--- /dev/null
+++ b/mc_work/go.sum
@@ -0,0 +1,9 @@
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
+github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
+gitlab.rrz.uni-hamburg.de/Bae5157/axticks v0.0.0-20220120103412-d663ebb46145 h1:02TpLZVj21Xg5OAKHE6vs+bJRlmyuQk4uphZXvDr/w0=
+gitlab.rrz.uni-hamburg.de/Bae5157/axticks v0.0.0-20220120103412-d663ebb46145/go.mod h1:5CNHyqeidRypmIVTnQksGqnmP56Oshw1Zv1nlUezrpQ=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/ackwork/ackwork.go b/mc_work/mc_work.go
similarity index 97%
rename from ackwork/ackwork.go
rename to mc_work/mc_work.go
index a219433..3f99cfc 100644
--- a/ackwork/ackwork.go
+++ b/mc_work/mc_work.go
@@ -1,13 +1,14 @@
// Aug 2021
-package ackwork
+package mc_work
import (
- "ackley_mc/ackwork/ackley"
"flag"
"fmt"
"io"
"os"
+
+ "ackley"
)
type mcPrm struct {
diff --git a/ackwork/ackwork_test.go b/mc_work/mc_work_test.go
similarity index 97%
rename from ackwork/ackwork_test.go
rename to mc_work/mc_work_test.go
index f6238b8..a6f6512 100644
--- a/ackwork/ackwork_test.go
+++ b/mc_work/mc_work_test.go
@@ -1,6 +1,6 @@
// Aug 2021
-package ackwork
+package mc_work
import (
"fmt"
@@ -113,7 +113,7 @@ func TestSetSuffix(t *testing.T) {
}
for _, s := range tdata {
- if tmp, err := SetSuffix(s.in, s.suffix); err != nil {
+ if tmp, err := SetSuffix(s.in, s.suffix); err == nil {
t.Fatal("setSuffix error handling", s)
} else {
if tmp != s.want {
diff --git a/ackwork/plot.go b/mc_work/plot.go
similarity index 99%
rename from ackwork/plot.go
rename to mc_work/plot.go
index 1bda4a8..f38c9dd 100644
--- a/ackwork/plot.go
+++ b/mc_work/plot.go
@@ -10,7 +10,7 @@
// define the GetTicks function. go-chart then calls this function, at
// apparently the right place, and the tick marks come out nicely.
-package ackwork
+package mc_work
import (
"fmt"
diff --git a/ackwork/plotres.r b/mc_work/plotres.r
similarity index 100%
rename from ackwork/plotres.r
rename to mc_work/plotres.r
diff --git a/ackwork/rdprm.go b/mc_work/rdprm.go
similarity index 99%
rename from ackwork/rdprm.go
rename to mc_work/rdprm.go
index 709fff8..3730db7 100644
--- a/ackwork/rdprm.go
+++ b/mc_work/rdprm.go
@@ -4,7 +4,7 @@
// These are stored in a map along with string values. These are then converted
// to floats or ints and put into a structure or variable.
-package ackwork
+package mc_work
import (
"bufio"
diff --git a/ackwork/set_suffix.go b/mc_work/set_suffix.go
similarity index 98%
rename from ackwork/set_suffix.go
rename to mc_work/set_suffix.go
index 5edf6d4..67c13c2 100644
--- a/ackwork/set_suffix.go
+++ b/mc_work/set_suffix.go
@@ -1,5 +1,5 @@
// a utility
-package ackwork
+package mc_work
import (
"errors"
diff --git a/nothing_test.go b/nothing_test.go
new file mode 100644
index 0000000..9ae26fa
--- /dev/null
+++ b/nothing_test.go
@@ -0,0 +1,13 @@
+// Put something here so everything looks neat on recursive test.
+
+package main
+
+import (
+ "testing"
+)
+
+func TestNot (t *testing.T) {
+ if false {
+ t.Fatalf ("banana")
+ }
+}
--
GitLab