master > master: code - metrics für moves

code/golang/internal/core/metrics/metrics.go

@@ -17,6 +17,7 @@ import (
  * ---------------------------------------------------------------- */
 
 var _ctr_time = types.NewCounter()
+var _ctr_moves = types.NewCounter()
 var _ctr_space = types.NewCounter()
 var _tmr = types.NewTimer()
 
@@ -26,6 +27,7 @@ var _tmr = types.NewTimer()
 
 func ResetMetrics() {
 	_ctr_time.Reset()
+	_ctr_moves.Reset()
 	_ctr_space.Reset()
 	_tmr.Reset()
 }
@@ -42,14 +44,26 @@ func AddTimeCost(options ...int) {
 	_ctr_time.Add(options...)
 }
 
+func AddMovesCost(options ...int) {
+	_ctr_moves.Add(options...)
+}
+
 func AddSpaceCost(options ...int) {
 	_ctr_space.Add(options...)
 }
 
+func SetSpaceCost(n int) {
+	_ctr_space.Set(n)
+}
+
 func GetTimeCost() int {
 	return _ctr_time.Size()
 }
 
+func GetMovesCost() int {
+	return _ctr_moves.Size()
+}
+
 func GetSpaceCost() int {
 	return _ctr_space.Size()
 }

code/golang/internal/setup/setup_display.go

@@ -104,6 +104,7 @@ func DisplayMetrics() {
 	// logging.Plain("Dauer der Ausführung:   t  = \033[1m%[1]v\033[0m", metrics.GetTimeElapsed())
 	logging.Plain("Dauer der Ausführung:   t  = \033[1m%[1]v\033[0m", metrics.GetTimeElapsedLongFormat())
 	logging.Plain("Kosten (Zeit):        T(n) = \033[1m%[1]v\033[0m", displayCost(metrics.GetTimeCost()))
+	logging.Plain("Kosten (#Züge):       M(n) = \033[1m%[1]v\033[0m", displayCost(metrics.GetMovesCost()))
 	logging.Plain("Kosten (Platz):       S(n) = \033[1m%[1]v\033[0m", displayCost(metrics.GetSpaceCost()))
 	return
 }

code/golang/internal/types/types_counter.go

@@ -39,6 +39,14 @@ func (self Counter) Size() int {
 	return self.nr
 }
 
+func (self *Counter) Reset() {
+	self.nr = 0
+}
+
+func (self *Counter) Set(n int) {
+	self.nr = n
+}
+
 func (self *Counter) Add(options ...int) {
 	n := 1
 	if len(options) > 0 {
@@ -46,7 +54,3 @@ func (self *Counter) Add(options ...int) {
 	}
 	self.nr += n
 }
-
-func (self *Counter) Reset() {
-	self.nr = 0
-}