update

eigenmath.c

@@ -2410,6 +2410,8 @@ cmp_terms(struct atom *p1, struct atom *p2)
 	return 0;
 }
 
+// for example, sqrt(1/2) + sqrt(1/2) -> 2 sqrt(1/2) -> sqrt(2)
+
 int
 simplify_terms(int h)
 {

js/eigenmath.js

@@ -651,87 +651,6 @@ bignum_sub(u, v)
 	return w;
 }
 function
-caaddr(p)
-{
-	return car(car(cdr(cdr(p))));
-}
-function
-caadr(p)
-{
-	return car(car(cdr(p)));
-}
-function
-cadaddr(p)
-{
-	return car(cdr(car(cdr(cdr(p)))));
-}
-function
-cadadr(p)
-{
-	return car(cdr(car(cdr(p))));
-}
-function
-caddddr(p)
-{
-	return car(cdr(cdr(cdr(cdr(p)))));
-}
-function
-cadddr(p)
-{
-	return car(cdr(cdr(cdr(p))));
-}
-function
-caddr(p)
-{
-	return car(cdr(cdr(p)));
-}
-function
-cadr(p)
-{
-	return car(cdr(p));
-}
-function
-car(p)
-{
-	if ("car" in p)
-		return p.car;
-	else
-		return symbol(NIL);
-}
-function
-cdadr(p)
-{
-	return cdr(car(cdr(p)));
-}
-function
-cddadr(p)
-{
-	return cdr(cdr(car(cdr(p))));
-}
-function
-cddddr(p)
-{
-	return cdr(cdr(cdr(cdr(p))));
-}
-function
-cdddr(p)
-{
-	return cdr(cdr(cdr(p)));
-}
-function
-cddr(p)
-{
-	return cdr(cdr(p));
-}
-function
-cdr(p)
-{
-	if ("cdr" in p)
-		return p.cdr;
-	else
-		return symbol(NIL);
-}
-function
 cmp(p1, p2)
 {
 	var t;
@@ -1272,6 +1191,101 @@ decomp_product(F, X)
 		cons(); // makes MULTIPLY head of list
 	}
 }
+function
+car(p)
+{
+	if ("car" in p)
+		return p.car;
+	else
+		return symbol(NIL);
+}
+
+function
+cdr(p)
+{
+	if ("cdr" in p)
+		return p.cdr;
+	else
+		return symbol(NIL);
+}
+
+function
+cadr(p)
+{
+	return car(cdr(p));
+}
+
+function
+cddr(p)
+{
+	return cdr(cdr(p));
+}
+
+function
+caadr(p)
+{
+	return car(car(cdr(p)));
+}
+
+function
+caddr(p)
+{
+	return car(cdr(cdr(p)));
+}
+
+function
+cdadr(p)
+{
+	return cdr(car(cdr(p)));
+}
+
+function
+cdddr(p)
+{
+	return cdr(cdr(cdr(p)));
+}
+
+function
+caaddr(p)
+{
+	return car(car(cdr(cdr(p))));
+}
+
+function
+cadadr(p)
+{
+	return car(cdr(car(cdr(p))));
+}
+
+function
+cadddr(p)
+{
+	return car(cdr(cdr(cdr(p))));
+}
+
+function
+cddadr(p)
+{
+	return cdr(cdr(car(cdr(p))));
+}
+
+function
+cddddr(p)
+{
+	return cdr(cdr(cdr(cdr(p))));
+}
+
+function
+cadaddr(p)
+{
+	return car(cdr(car(cdr(cdr(p)))));
+}
+
+function
+caddddr(p)
+{
+	return car(cdr(cdr(cdr(cdr(p)))));
+}
 const HPAD = 10;
 const VPAD = 10;
 
@@ -3497,6 +3511,8 @@ cmp_terms(p1, p2)
 	return 0;
 }
 
+// for example, sqrt(1/2) + sqrt(1/2) -> 2 sqrt(1/2) -> sqrt(2)
+
 function
 simplify_terms(h)
 {

js/src/defs.js

@@ -0,0 +1,95 @@
+function
+car(p)
+{
+	if ("car" in p)
+		return p.car;
+	else
+		return symbol(NIL);
+}
+
+function
+cdr(p)
+{
+	if ("cdr" in p)
+		return p.cdr;
+	else
+		return symbol(NIL);
+}
+
+function
+cadr(p)
+{
+	return car(cdr(p));
+}
+
+function
+cddr(p)
+{
+	return cdr(cdr(p));
+}
+
+function
+caadr(p)
+{
+	return car(car(cdr(p)));
+}
+
+function
+caddr(p)
+{
+	return car(cdr(cdr(p)));
+}
+
+function
+cdadr(p)
+{
+	return cdr(car(cdr(p)));
+}
+
+function
+cdddr(p)
+{
+	return cdr(cdr(cdr(p)));
+}
+
+function
+caaddr(p)
+{
+	return car(car(cdr(cdr(p))));
+}
+
+function
+cadadr(p)
+{
+	return car(cdr(car(cdr(p))));
+}
+
+function
+cadddr(p)
+{
+	return car(cdr(cdr(cdr(p))));
+}
+
+function
+cddadr(p)
+{
+	return cdr(cdr(car(cdr(p))));
+}
+
+function
+cddddr(p)
+{
+	return cdr(cdr(cdr(cdr(p))));
+}
+
+function
+cadaddr(p)
+{
+	return car(cdr(car(cdr(cdr(p)))));
+}
+
+function
+caddddr(p)
+{
+	return car(cdr(cdr(cdr(cdr(p)))));
+}