summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.lsq_funcs2
-rw-r--r--src/lsq_funcs.mac36
2 files changed, 25 insertions, 13 deletions
diff --git a/src/Makefile.lsq_funcs b/src/Makefile.lsq_funcs
index e573323..f818dbd 100644
--- a/src/Makefile.lsq_funcs
+++ b/src/Makefile.lsq_funcs
@@ -1,4 +1,4 @@
all: lsq_funcs.c
-lsq_funcs.c: lsq_funcs.max
+lsq_funcs.c: lsq_funcs.mac
maxima -b lsq_funcs.mac | grep "^mac_" > lsq_funcs.c
diff --git a/src/lsq_funcs.mac b/src/lsq_funcs.mac
index 671aae2..0c7b7cd 100644
--- a/src/lsq_funcs.mac
+++ b/src/lsq_funcs.mac
@@ -14,15 +14,27 @@ y : y_unrot * cos(c_tilt) - x_unrot * sin(c_tilt)$
*/
x_expand : trigexpand(x)$
y_expand : trigexpand(y)$
-sprint("mac_x = ", string(subst(pow, "^", x_expand)))$
-sprint("mac_y = ", string(subst(pow, "^",y_expand)))$
-sprint("mac_x_dc_view = ", string(subst(pow, "^",diff(x_expand, c_view))))$
-sprint("mac_x_dc_nick = ", string(subst(pow, "^",diff(x_expand, c_nick))))$
-sprint("mac_x_dscale = ", string(subst(pow, "^",diff(x_expand, scale))))$
-sprint("mac_x_dk0 = ", string(subst(pow, "^",diff(x_expand, k0))))$
-sprint("mac_x_dk1 = ", string(subst(pow, "^",diff(x_expand, k1))))$
-sprint("mac_y_dc_view = ", string(subst(pow, "^",diff(y_expand, c_view))))$
-sprint("mac_y_dc_nick = ", string(subst(pow, "^",diff(y_expand, c_nick))))$
-sprint("mac_y_dscale = ", string(subst(pow, "^",diff(y_expand, scale))))$
-sprint("mac_y_dk0 = ", string(subst(pow, "^",diff(y_expand, k0))))$
-sprint("mac_y_dk1 = ", string(subst(pow, "^",diff(y_expand, k1))))$
+sprint("mac_x =",string(subst(pow, "^", x_expand)),";","
+")$
+sprint("mac_y = ", string(subst(pow, "^",y_expand)),";","
+")$
+sprint("mac_x_dc_view = ", string(subst(pow, "^",diff(x_expand, c_view))),";","
+")$
+sprint("mac_x_dc_nick = ", string(subst(pow, "^",diff(x_expand, c_nick))),";","
+")$
+sprint("mac_x_dscale = ", string(subst(pow, "^",diff(x_expand, scale))),";","
+")$
+sprint("mac_x_dk0 = ", string(subst(pow, "^",diff(x_expand, k0))),";","
+")$
+sprint("mac_x_dk1 = ", string(subst(pow, "^",diff(x_expand, k1))),";","
+")$
+sprint("mac_y_dc_view = ", string(subst(pow, "^",diff(y_expand, c_view))),";","
+")$
+sprint("mac_y_dc_nick = ", string(subst(pow, "^",diff(y_expand, c_nick))),";","
+")$
+sprint("mac_y_dscale = ", string(subst(pow, "^",diff(y_expand, scale))),";","
+")$
+sprint("mac_y_dk0 = ", string(subst(pow, "^",diff(y_expand, k0))),";","
+")$
+sprint("mac_y_dk1 = ", string(subst(pow, "^",diff(y_expand, k1))),";","
+")$