Skip to content
This repository was archived by the owner on Apr 3, 2019. It is now read-only.

Commit c513fa3

Browse files
perostOpenModelica-Hudson
authored andcommitted
Update nfinst tests.
Belonging to [master]: - OpenModelica/OMCompiler#2088 - #808
1 parent 8225904 commit c513fa3

5 files changed

Lines changed: 26 additions & 26 deletions

File tree

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// name: CevalAcos2
22
// keywords:
3-
// status: incorrect
3+
// status: correct
44
// cflags: -d=newInst
55
//
66
//
@@ -10,11 +10,9 @@ model CevalAcos2
1010
end CevalAcos2;
1111

1212
// Result:
13-
// Error processing file: CevalAcos2.mo
13+
// class CevalAcos2
14+
// constant Real r1 = acos(1.3);
15+
// end CevalAcos2;
1416
// [flattening/modelica/scodeinst/CevalAcos2.mo:9:3-9:31:writable] Error: Argument 1.3 of acos is out of range (-1 <= x <= 1)
1517
//
16-
// # Error encountered! Exiting...
17-
// # Please check the error message and the flags.
18-
//
19-
// Execution failed!
2018
// endResult
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// name: CevalLog102
22
// keywords:
3-
// status: incorrect
3+
// status: correct
44
// cflags: -d=newInst
55
//
66
//
@@ -10,11 +10,9 @@ model CevalLog102
1010
end CevalLog102;
1111

1212
// Result:
13-
// Error processing file: CevalLog102.mo
13+
// class CevalLog102
14+
// constant Real r1 = log10(-1.0);
15+
// end CevalLog102;
1416
// [flattening/modelica/scodeinst/CevalLog102.mo:9:3-9:31:writable] Error: Argument -1 of log10 is out of range (x > 0)
1517
//
16-
// # Error encountered! Exiting...
17-
// # Please check the error message and the flags.
18-
//
19-
// Execution failed!
2018
// endResult
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// name: CevalLog2
22
// keywords:
3-
// status: incorrect
3+
// status: correct
44
// cflags: -d=newInst
55
//
66
//
@@ -10,11 +10,9 @@ model CevalLog2
1010
end CevalLog2;
1111

1212
// Result:
13-
// Error processing file: CevalLog2.mo
13+
// class CevalLog2
14+
// constant Real r1 = log(-1.0);
15+
// end CevalLog2;
1416
// [flattening/modelica/scodeinst/CevalLog2.mo:9:3-9:29:writable] Error: Argument -1 of log is out of range (x > 0)
1517
//
16-
// # Error encountered! Exiting...
17-
// # Please check the error message and the flags.
18-
//
19-
// Execution failed!
2018
// endResult

flattening/modelica/scodeinst/FuncBuiltinOuterProduct.mo

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,17 @@ model FuncBuiltinOuterProduct
1111
end FuncBuiltinOuterProduct;
1212

1313
// Result:
14-
// Error processing file: FuncBuiltinOuterProduct.mo
15-
// Error: Cannot resolve type of expression ' matrix(v1) .* transpose(matrix(v2)) '. The operands have types ' Real[:, 1] .* Real[1, :] ' in component Real[:, 1].
16-
//
17-
// # Error encountered! Exiting...
18-
// # Please check the error message and the flags.
19-
//
20-
// Execution failed!
14+
// class FuncBuiltinOuterProduct
15+
// Real x[1,1];
16+
// Real x[1,2];
17+
// Real x[1,3];
18+
// Real x[2,1];
19+
// Real x[2,2];
20+
// Real x[2,3];
21+
// Real x[3,1];
22+
// Real x[3,2];
23+
// Real x[3,3];
24+
// equation
25+
// x = outerProduct({1.0, 2.0, 3.0}, {4.0, 5.0, 6.0});
26+
// end FuncBuiltinOuterProduct;
2127
// endResult

flattening/modelica/scodeinst/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ FuncBuiltinMin.mo \
280280
FuncBuiltinMod.mo \
281281
FuncBuiltinNdims.mo \
282282
FuncBuiltinOnes.mo \
283+
FuncBuiltinOuterProduct.mo \
283284
FuncBuiltinPre.mo \
284285
FuncBuiltinProduct.mo \
285286
FuncBuiltinRem.mo \
@@ -549,7 +550,6 @@ expconn7.mo \
549550
func1.mo \
550551
FuncBuiltinCardinality.mo \
551552
FuncBuiltinEnumTypeName.mo \
552-
FuncBuiltinOuterProduct.mo \
553553
FuncBuiltinReduction.mo \
554554
function1.mo \
555555
FunctionRecordArg1.mo \

0 commit comments

Comments
 (0)