regression and database improvements

added Replace() to database package

simplified Regressor interface

playback regressor can now be reduxed

regression Redux() now uses database.Replace() instead of separate
Delete() and Add(). this makes sure that the redux entry gets the same
database key once the redux has completed

removed -dryrun option from REGRESS REDUX

removed regression fails log. it wasn't well developed and not a
particularly useful idea

fixed television.SetSimple(). the signal function was not set correctly

database/database.go

@@ -52,6 +52,17 @@ func (db Session) SortedKeyList() []int {
 	return keyList
 }
 
+// Replace an entry with another.
+func (db *Session) Replace(key int, old Entry, ent Entry) error {
+	_, ok := db.entries[key]
+	if !ok {
+		return fmt.Errorf("database: key not available (%d)", key)
+	}
+	delete(db.entries, key)
+	db.entries[key] = ent
+	return old.CleanUp()
+}
+
 // Add an entry to the db.
 func (db *Session) Add(ent Entry) error {
 	var key int

database/select.go

@@ -15,10 +15,6 @@
 
 package database
 
-import (
-	"fmt"
-)
-
 // SelectAll entries in the database. onSelect can be nil.
 //
 // onSelect() should return true if select process is to continue. Continue
@@ -68,15 +64,14 @@ func (db Session) SelectKeys(onSelect func(Entry, int) error, keys ...int) (Entr
 
 	for i := range keys {
 		entry = db.entries[keys[i]]
+		if entry == nil {
+			continue
+		}
 		err := onSelect(entry, keys[i])
 		if err != nil {
 			return entry, err
 		}
 	}
 
-	if entry == nil {
-		return nil, fmt.Errorf("select empty")
-	}
-
 	return entry, nil
 }

gopher2600.go

@@ -844,11 +844,11 @@ with the LOG mode. Note that asking for log output will suppress regression prog
 
 func regressRedux(mode string, args []string) error {
 	var yes bool
-	var dryRun bool
+	var verbose bool
 
 	flgs := flag.NewFlagSet(mode, flag.ExitOnError)
 	flgs.BoolVar(&yes, "yes", false, "answer yes to confirmation request")
-	flgs.BoolVar(&dryRun, "dryrun", false, "do not perform redux, only show what would happen")
+	flgs.BoolVar(&verbose, "v", false, "output more detail")
 
 	// parse args and get copy of remaining arguments
 	err := flgs.Parse(args)
@@ -864,7 +864,7 @@ func regressRedux(mode string, args []string) error {
 		confirmation = os.Stdin
 	}
 
-	return regression.RegressRedux(os.Stdout, confirmation, dryRun, args)
+	return regression.RegressRedux(os.Stdout, confirmation, verbose, args)
 }
 
 func regressCleanup(mode string, args []string) error {

hardware/television/simple.go

@@ -46,10 +46,12 @@ func (tv *Television) SetSimple(set bool) {
 	if set {
 		if tv.simple == nil {
 			tv.simple = &simple{}
+			tv.signal = tv.signalSimple
 		}
 	} else {
 		if tv.simple != nil {
 			tv.simple = nil
+			tv.signal = tv.signalFull
 		}
 	}
 }

regression/log.go

@@ -121,8 +121,14 @@ func (reg LogRegression) String() string {
 	return s.String()
 }
 
+// redux implements the regression.Regressor interface.
+func (reg *LogRegression) redux(messages io.Writer, tag string) (Regressor, error) {
+	old := *reg
+	return &old, reg.regress(true, messages, tag)
+}
+
 // regress implements the regression.Regressor interface.
-func (reg *LogRegression) regress(newRegression bool, output io.Writer, msg string) (bool, string, error) {
+func (reg *LogRegression) regress(newRegression bool, messages io.Writer, tag string) error {
 	// make sure logger is clear
 	logger.Clear()
 
@@ -131,20 +137,20 @@ func (reg *LogRegression) regress(newRegression bool, output io.Writer, msg stri
 	logger.SetEcho(logOutput, false)
 
 	// start output with message
-	output.Write([]byte(msg))
+	messages.Write([]byte(tag))
 
 	// create headless television. we'll use this to initialise the digester
 	tv, err := television.NewSimpleTelevision(reg.TVtype)
 	if err != nil {
-		return false, "", fmt.Errorf("log: %w", err)
+		return fmt.Errorf("log: %w", err)
 	}
 	defer tv.End()
 	tv.SetFPSCap(false)
 
 	// create VCS and attach cartridge
 	vcs, err := hardware.NewVCS(environment.MainEmulation, tv, nil, nil)
 	if err != nil {
-		return false, "", fmt.Errorf("log: %w", err)
+		return fmt.Errorf("log: %w", err)
 	}
 
 	// we want the machine in a known state. the easiest way to do this is to
@@ -153,13 +159,13 @@ func (reg *LogRegression) regress(newRegression bool, output io.Writer, msg stri
 
 	cartload, err := cartridgeloader.NewLoaderFromFilename(reg.Cartridge, reg.Mapping, "AUTO", nil)
 	if err != nil {
-		return false, "", fmt.Errorf("log: %w", err)
+		return fmt.Errorf("log: %w", err)
 	}
 	defer cartload.Close()
 
 	err = setup.AttachCartridge(vcs, cartload, true)
 	if err != nil {
-		return false, "", fmt.Errorf("log: %w", err)
+		return fmt.Errorf("log: %w", err)
 	}
 
 	// display ticker for progress meter
@@ -177,15 +183,15 @@ func (reg *LogRegression) regress(newRegression bool, output io.Writer, msg stri
 		select {
 		case <-tck.C:
 			frame := vcs.TV.GetCoords().Frame
-			output.Write([]byte(fmt.Sprintf("\r%s [%d/%d (%.1f%%)]", msg, frame, reg.NumFrames, 100*(float64(frame)/float64(reg.NumFrames)))))
+			messages.Write([]byte(fmt.Sprintf("\r%s [%d/%d (%.1f%%)]", tag, frame, reg.NumFrames, 100*(float64(frame)/float64(reg.NumFrames)))))
 		default:
 		}
 
 		return govern.Running, nil
 	})
 
 	if err != nil {
-		return false, "", fmt.Errorf("log: %w", err)
+		return fmt.Errorf("log: %w", err)
 	}
 
 	// get hash of log output
@@ -198,8 +204,8 @@ func (reg *LogRegression) regress(newRegression bool, output io.Writer, msg stri
 
 	// compare hashes from this run and the specimen run
 	if reg.digest != fmt.Sprintf("%x", hash) {
-		return false, "digest mismatch", nil
+		return fmt.Errorf("digest mismatch")
 	}
 
-	return true, "", nil
+	return nil
 }