replace Fm -> From

chem/conc.go

@@ -9,7 +9,7 @@ func CoToN(co, vol float64) float64 {
 	return co * vol
 }
 
-// CoFmN returns concentration from N, for given volume: co / vol
-func CoFmN(n, vol float64) float64 {
+// CoFromN returns concentration from N, for given volume: co / vol
+func CoFromN(n, vol float64) float64 {
 	return n / vol
 }

chem/enz.go

@@ -42,7 +42,7 @@ func (rt *Enz) Update() {
 // occurring in forward component (s * e), vs just 1 in back
 func (rt *Enz) SetKmVol(km, vol, k2, k3 float64) {
 	k1 := (k2 + k3) / km
-	rt.K1 = CoFmN(k1, vol)
+	rt.K1 = CoFromN(k1, vol)
 	rt.K2 = k2
 	rt.K3 = k3
 	rt.Update()

chem/enzrate.go

@@ -49,7 +49,7 @@ func (rt *EnzRate) Update() {
 // occurring in forward component (s * e), vs just 1 in back
 func (rt *EnzRate) SetKmVol(km, vol, k2, k3 float64) {
 	k1 := (k2 + k3) / km
-	rt.K1 = CoFmN(k1, vol)
+	rt.K1 = CoFromN(k1, vol)
 	rt.K2 = k2
 	rt.K3 = k3
 	rt.Update()

chem/react.go

@@ -32,7 +32,7 @@ type React struct {
 // dividing forward Kf by volume to compensate for 2 volume-based concentrations
 // occurring in forward component, vs just 1 in back
 func (rt *React) SetVol(f, vol, b float64) {
-	rt.Kf = CoFmN(f, vol)
+	rt.Kf = CoFromN(f, vol)
 	rt.Kb = b
 }
 

chem/senz.go

@@ -24,7 +24,7 @@ type SimpleEnz struct {
 // dividing forward Kf by volume to compensate for 2 volume-based concentrations
 // occurring in forward component, vs just 1 in back
 func (rt *SimpleEnz) SetVol(f, vol float64) {
-	rt.Kf = CoFmN(f, vol)
+	rt.Kf = CoFromN(f, vol)
 }
 
 // Step computes delta S and P values based on current S, E values
@@ -37,7 +37,7 @@ func (rt *SimpleEnz) Step(cs, ce float64, ds, dp *float64) {
 // StepCo computes delta S and P values based on current S, E values
 // based on concentration
 func (rt *SimpleEnz) StepCo(cs, ce, vol float64, ds, dp *float64) {
-	df := rt.Kf * CoFmN(cs, vol) * CoFmN(ce, vol) // forward
+	df := rt.Kf * CoFromN(cs, vol) * CoFromN(ce, vol) // forward
 	*ds -= df
 	*dp += df
 }

egui/plots.go

@@ -34,7 +34,7 @@ func (gui *GUI) AddPlots(title string, lg *elog.Logs) {
 
 		plt := gui.NewPlotTab(key, mode+" "+time+" Plot")
 		plt.SetTable(lt.Table)
-		plt.Params.FmMetaMap(lt.Meta)
+		plt.Params.FromMetaMap(lt.Meta)
 
 		ConfigPlotFromLog(title, plt, lg, key)
 	}
@@ -67,8 +67,8 @@ func ConfigPlotFromLog(title string, plt *eplot.Plot2D, lg *elog.Logs, key etime
 			plt.Params.LegendCol = legend
 		}
 	}
-	plt.ColsFmMetaMap(lt.Table.MetaData)
-	plt.ColsFmMetaMap(lt.Meta)
+	plt.ColsFromMetaMap(lt.Table.MetaData)
+	plt.ColsFromMetaMap(lt.Meta)
 	plt.Update()
 }
 

evec/vec2i.go

@@ -32,18 +32,18 @@ func NewVec2iScalar(s int) Vec2i {
 	return Vec2i{X: s, Y: s}
 }
 
-// NewVec2iFmVec2Round converts from floating point mat32.Vec2 vector to int, using rounding
-func NewVec2iFmVec2Round(v mat32.Vec2) Vec2i {
+// NewVec2iFromVec2Round converts from floating point mat32.Vec2 vector to int, using rounding
+func NewVec2iFromVec2Round(v mat32.Vec2) Vec2i {
 	return Vec2i{int(mat32.Round(v.X)), int(mat32.Round(v.Y))}
 }
 
-// NewVec2iFmVec2Floor converts from floating point mat32.Vec2 vector to int, using floor
-func NewVec2iFmVec2Floor(v mat32.Vec2) Vec2i {
+// NewVec2iFromVec2Floor converts from floating point mat32.Vec2 vector to int, using floor
+func NewVec2iFromVec2Floor(v mat32.Vec2) Vec2i {
 	return Vec2i{int(mat32.Floor(v.X)), int(mat32.Floor(v.Y))}
 }
 
-// NewVec2iFmVec2Ceil converts from floating point mat32.Vec2 vector to int, using ceil
-func NewVec2iFmVec2Ceil(v mat32.Vec2) Vec2i {
+// NewVec2iFromVec2Ceil converts from floating point mat32.Vec2 vector to int, using ceil
+func NewVec2iFromVec2Ceil(v mat32.Vec2) Vec2i {
 	return Vec2i{X: int(mat32.Ceil(v.X)), Y: int(mat32.Ceil(v.Y))}
 }
 

patgen/configvocab.go

@@ -47,9 +47,9 @@ func PctActInTensor(trow *etensor.Float32) float32 {
 	return float32(NOnInTensor(trow)) / float32(trow.Len())
 }
 
-// NFmPct returns the number of bits for given pct (proportion 0-1),
+// NFromPct returns the number of bits for given pct (proportion 0-1),
 // relative to total n.  uses math.Round.
-func NFmPct(pct float32, n int) int {
+func NFromPct(pct float32, n int) int {
 	return int(math.Round(float64(n) * float64(pct)))
 }
 
@@ -71,8 +71,8 @@ func AddVocabEmpty(mp Vocab, name string, rows, poolY, poolX int) (*etensor.Floa
 // will be returned and printed if it cannot be satisfied in a reasonable
 // amount of time.
 func AddVocabPermutedBinary(mp Vocab, name string, rows, poolY, poolX int, pctAct, minPctDiff float32) (*etensor.Float32, error) {
-	nOn := NFmPct(pctAct, poolY*poolX)
-	minDiff := NFmPct(minPctDiff, nOn)
+	nOn := NFromPct(pctAct, poolY*poolX)
+	minDiff := NFromPct(minPctDiff, nOn)
 	tsr := etensor.NewFloat32([]int{rows, poolY, poolX}, nil, []string{"row", "Y", "X"})
 	err := PermutedBinaryMinDiff(tsr, nOn, 1, 0, minDiff)
 	mp[name] = tsr

weights/cpp.go

@@ -73,7 +73,7 @@ func NetReadCpp(r io.Reader) (*Network, error) {
 			if err != nil {
 				errlist = append(errlist, err)
 			}
-			fm := strings.TrimPrefix(css[1], "Fm:")
+			fm := strings.TrimPrefix(css[1], "From:")
 			if len(lw.Prjns) < pi+1 {
 				lw.Prjns = append(lw.Prjns, Prjn{From: fm})
 			}