Skip to content

Commit 446cfc7

Browse files
yueminglyuemingl
committed
Chage names of SymMatrix and SymVector to ExprMatrix and ExprVector
1 parent 961dc89 commit 446cfc7

23 files changed

+239
-124
lines changed

‎src/symjava/examples/BenchmarkRosenbrock.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import java.io.PrintWriter;
88

99
import symjava.math.SymMath;
10-
import symjava.matrix.SymMatrix;
11-
import symjava.matrix.SymVector;
10+
import symjava.matrix.ExprMatrix;
11+
import symjava.matrix.ExprVector;
1212
import symjava.numeric.NumMatrix;
1313
import symjava.numeric.NumVector;
1414
import symjava.symbolic.Expr;
@@ -41,8 +41,8 @@ public static double test(int N) {
4141

4242
Expr[] freeVars = xi.get(1, N);
4343
begin = System.currentTimeMillis();
44-
SymVector grad = SymMath.grad(rosen);
45-
SymMatrix hess = SymMath.hess(rosen);
44+
ExprVector grad = SymMath.grad(rosen);
45+
ExprMatrix hess = SymMath.hess(rosen);
4646
end = System.currentTimeMillis();
4747
double timeSym = (end-begin)/1000.0;
4848

@@ -230,7 +230,7 @@ public static void print_main(PrintWriter writer, int N) {
230230
writer.println("//g++ -O3 benchmark-rosenbrock-manual.cpp -o run");
231231
}
232232

233-
public static void print_c_code(PrintWriter pw, SymVector grad) {
233+
public static void print_c_code(PrintWriter pw, ExprVector grad) {
234234
Symbol i = new Symbol("i");
235235
Symbols xi = new Symbols("x", i);
236236
pw.println("void grad_"+grad.dim()+"(double* args, double* outAry) {");
@@ -248,7 +248,7 @@ public static void print_c_code(PrintWriter pw, SymVector grad) {
248248
pw.println("}");
249249
}
250250

251-
public static void print_c_code(PrintWriter pw, SymMatrix hess) {
251+
public static void print_c_code(PrintWriter pw, ExprMatrix hess) {
252252
Symbol i = new Symbol("i");
253253
Symbols xi = new Symbols("x", i);
254254
pw.println("void hess_"+hess.rowDim()+"(double* args, double* outAry) {");

‎src/symjava/examples/Example4.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ public static void main(String[] args) {
3535
Expr[] dxs = new Expr[]{phi, psi, chi };
3636
//We want print the exact expression instead of \nebla{L}
3737
//SymVector Lx = Grad.apply(L, xs, dxs);
38-
SymVector Lx = Grad.apply(Lexpr, xs, dxs);
38+
ExprVector Lx = Grad.apply(Lexpr, xs, dxs);
3939
System.out.println("\nGradient Lx = (Lu, Llamd, Lq) =");
4040
System.out.println(Lx.toString());
4141

4242
Func du = new Func("\\delta{u}", x,y,z);
4343
Func dl = new Func("\\delta{\\lambda}", x,y,z);
4444
Func dq = new Func("\\delta{q}", x,y,z);
4545
Expr[] dxs2 = new Expr[] { du, dl, dq };
46-
SymMatrix Lxx = new SymMatrix();
46+
ExprMatrix Lxx = new ExprMatrix();
4747
for(Expr Lxi : Lx) {
4848
Lxx.append(Grad.apply(Lxi, xs, dxs2));
4949
}

‎src/symjava/examples/Example4Old.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
*
1515
*/
1616
public class Example4Old {
17-
public static SymVector grad(Func f) {
18-
SymVector g = new SymVector();
17+
public static ExprVector grad(Func f) {
18+
ExprVector g = new ExprVector();
1919
for(Expr arg : f.args) {
2020
g.add(f.diff(arg));
2121
}
2222
return g;
2323
}
24-
public static Expr dot(SymVector a, SymVector b) {
24+
public static Expr dot(ExprVector a, ExprVector b) {
2525
if(a.dim() != b.dim())
2626
return null;
2727
List<Expr> list = new ArrayList<Expr>();
@@ -40,8 +40,8 @@ public static Expr fdiff(Expr F, Expr f, Expr df) {
4040
}
4141

4242
//Functional grad
43-
public static SymVector fgrad(Expr F, Expr[] fs, Expr[] dfs) {
44-
SymVector g = new SymVector();
43+
public static ExprVector fgrad(Expr F, Expr[] fs, Expr[] dfs) {
44+
ExprVector g = new ExprVector();
4545
for(int i=0; i<fs.length; i++) {
4646
g.add(fdiff(F, fs[i], dfs[i]));
4747
}
@@ -66,15 +66,15 @@ public static void main(String[] args) {
6666
Func chi = new Func("\\chi ", x,y,z);
6767
Expr[] xs = new Expr[]{u, lamd, q };
6868
Expr[] dxs = new Expr[]{phi, psi, chi };
69-
SymVector Lx = fgrad(L, xs, dxs);
69+
ExprVector Lx = fgrad(L, xs, dxs);
7070
System.out.println("\nGradient Lx = (Lu, Llamd, Lq) =");
7171
System.out.println(Lx);
7272

7373
Func du = new Func("\\delta{u}", x,y,z);
7474
Func dl = new Func("\\delta{\\lambda}", x,y,z);
7575
Func dq = new Func("\\delta{q}", x,y,z);
7676
Expr[] dxs2 = new Expr[] { du, dl, dq };
77-
SymMatrix Lxx = new SymMatrix();
77+
ExprMatrix Lxx = new ExprMatrix();
7878
for(Expr Lxi : Lx) {
7979
Lxx.append(fgrad(Lxi, xs, dxs2));
8080
}

‎src/symjava/examples/Example6.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import symjava.examples.fem.RefTriangle;
1717
import symjava.examples.fem.WeakForm;
1818
import symjava.math.Transformation;
19-
import symjava.matrix.SymMatrix;
19+
import symjava.matrix.ExprMatrix;
2020
import symjava.numeric.NumInt;
2121
import symjava.relational.Eq;
2222
import symjava.symbolic.Expr;
@@ -95,7 +95,7 @@ public static void solve(WeakForm wf, Mesh2D mesh, Map<Integer, Double> dirichle
9595
);
9696
// jac = (xr xs)
9797
// (yr ys)
98-
SymMatrix jacMat = trans.getJacobianMatrix();
98+
ExprMatrix jacMat = trans.getJacobianMatrix();
9999
System.out.println(jacMat);
100100
System.out.println();
101101

‎src/symjava/examples/Example7.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import symjava.domains.Domain;
1414
import symjava.examples.fem.*;
1515
import symjava.math.Transformation;
16-
import symjava.matrix.SymMatrix;
16+
import symjava.matrix.ExprMatrix;
1717
import symjava.numeric.NumFunc;
1818
import symjava.numeric.NumInt;
1919
import symjava.relational.Eq;
@@ -102,7 +102,7 @@ public static void solve(WeakForm pde, Map<Integer, Double> dirichlet, String ou
102102
//Jacobian matrix of the transformation
103103
// jacMat = (xr xs)
104104
// (yr ys)
105-
SymMatrix jacMat = trans.getJacobianMatrix();
105+
ExprMatrix jacMat = trans.getJacobianMatrix();
106106
System.out.println(jacMat+"\n");
107107

108108
//Shape functions

‎src/symjava/examples/GaussNewton.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public static double[] solve2(Eq eq, double[] init, double[][] data, int maxIter
4343
int n = data.length;
4444

4545
//Construct Jacobian Matrix and Residuals
46-
SymVector res = new SymVector(n);
47-
SymMatrix J = new SymMatrix(n, eq.getParams().length);
46+
ExprVector res = new ExprVector(n);
47+
ExprMatrix J = new ExprMatrix(n, eq.getParams().length);
4848

4949
Expr[] params = eq.getParams();
5050
for(int i=0; i<n; i++) {

‎src/symjava/examples/Newton.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package symjava.examples;
22

3-
import symjava.matrix.SymMatrix;
4-
import symjava.matrix.SymVector;
3+
import symjava.matrix.ExprMatrix;
4+
import symjava.matrix.ExprVector;
55
import symjava.numeric.NumMatrix;
66
import symjava.numeric.NumVector;
77
import symjava.relational.Eq;
@@ -60,8 +60,8 @@ public static double[] solve(Eq[] eqs, double[] init, double[] params, int maxIt
6060
int n = unknowns.length;
6161

6262
//Construct Jacobian Matrix
63-
SymVector lhss = new SymVector(m);
64-
SymMatrix hess = new SymMatrix(m, n);
63+
ExprVector lhss = new ExprVector(m);
64+
ExprMatrix hess = new ExprMatrix(m, n);
6565
for(int i=0; i<m; i++) {
6666
for(int j=0; j<n; j++) {
6767
lhss[i] = eqs[i].lhs();

‎src/symjava/examples/NewtonOptimization.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package symjava.examples;
22

3-
import symjava.matrix.SymMatrix;
4-
import symjava.matrix.SymVector;
3+
import symjava.matrix.ExprMatrix;
4+
import symjava.matrix.ExprVector;
55
import symjava.numeric.NumMatrix;
66
import symjava.numeric.NumVector;
77
import symjava.relational.Eq;
@@ -24,8 +24,8 @@ public static double[] solve(Eq eq, double[] initAndOut, int maxIter, double eps
2424
int n = unknowns.length;
2525

2626
//Construct Hessian Matrix
27-
SymVector grad = new SymVector(n);
28-
SymMatrix hess = new SymMatrix(n, n);
27+
ExprVector grad = new ExprVector(n);
28+
ExprMatrix hess = new ExprMatrix(n, n);
2929
Expr L = eq.lhs();
3030
for(int i=0; i<n; i++) {
3131
grad[i] = L.diff(unknowns[i]);

‎src/symjava/examples/SVM.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import javax.swing.JPanel;
1313
import javax.swing.SwingUtilities;
1414

15-
import symjava.matrix.SymVector;
15+
import symjava.matrix.ExprVector;
1616
import symjava.relational.Eq;
1717
import symjava.symbolic.*;
1818
import symjava.symbolic.utils.AddList;
@@ -158,13 +158,13 @@ public static void main(String[] args) {
158158

159159
public static double[] solve(double[][] data, double[] init) {
160160
int nFeatures = data[0].length - 1;
161-
SymVector w = new SymVector("w", 1, nFeatures);
161+
ExprVector w = new ExprVector("w", 1, nFeatures);
162162

163163
Expr sumf = 0.5*dot(w, w);
164164
System.out.println(sumf);
165165

166-
SymVector lmd = new SymVector("\\lambda", 1, data.length);
167-
SymVector c = new SymVector("c", 1, data.length); //slack variable
166+
ExprVector lmd = new ExprVector("\\lambda", 1, data.length);
167+
ExprVector c = new ExprVector("c", 1, data.length); //slack variable
168168
AddList addList = new AddList();
169169
for (int i = 0; i < data.length; i++) {
170170
double[] xi = data[i];

‎src/symjava/math/Div.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import symjava.matrix.SymVector;
6+
import symjava.matrix.ExprVector;
77
import symjava.symbolic.Expr;
88
import symjava.symbolic.TypeInfo;
99
import symjava.symbolic.arity.NaryOp;
@@ -16,7 +16,7 @@
1616
public class Div extends NaryOp {
1717
protected Expr expr;
1818

19-
public Div(SymVector vec) {
19+
public Div(ExprVector vec) {
2020
super(null);
2121
if(vec instanceof Grad) {
2222
Grad g = (Grad)vec;
@@ -31,12 +31,12 @@ public Div(SymVector vec) {
3131
create(vec, freeVars.toArray(new Expr[0]));
3232
}
3333

34-
public Div(SymVector vec, Expr... freeVars) {
34+
public Div(ExprVector vec, Expr... freeVars) {
3535
super(null);
3636
create(vec, freeVars);
3737
}
3838

39-
private Div create(SymVector vec, Expr... freeVars) {
39+
private Div create(ExprVector vec, Expr... freeVars) {
4040
if(vec.dim() != freeVars.length) {
4141
throw new RuntimeException("vec.dim() != freeVars.length");
4242
}
@@ -52,11 +52,11 @@ private Div create(SymVector vec, Expr... freeVars) {
5252
return this;
5353
}
5454

55-
public static Div apply(SymVector vec) {
55+
public static Div apply(ExprVector vec) {
5656
return new Div(vec);
5757
}
5858

59-
public static Div apply(SymVector vec, Expr ...expr) {
59+
public static Div apply(ExprVector vec, Expr ...expr) {
6060
return new Div(vec, expr);
6161
}
6262

0 commit comments

Comments
 (0)