Commit 4ec29521 authored by Jan Philipp Haller's avatar Jan Philipp Haller
Browse files

Merge branch 'MatrixDimensionFix' into Haller

parents 141129f9 aa820c42
......@@ -10,7 +10,7 @@
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-generator</artifactId>
<version>0.2.12-SNAPSHOT</version>
<version>0.4.1-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
......
......@@ -38,7 +38,7 @@ public class MathInformationRegister {
}
public int getAmountRows(String name) {
return getAmount(name, 1);
return getAmount(name, 0);
}
public int getAmountRows(String name, MathMatrixAccessOperatorSymbol mathMatrixAccessOperatorSymbol) {
......@@ -52,7 +52,7 @@ public class MathInformationRegister {
if (firstDoubleDot)
result = 1;
else {
result = getAmount(name, 1);
result = getAmount(name, 0);
}
return result;
}
......@@ -90,9 +90,9 @@ public class MathInformationRegister {
int result = 0;
if (mathValueSymbol != null) {
String numberString = mathValueSymbol.getType().getDimensions().get(dimension).getTextualRepresentation();
//Log.info(name, "Name:");
//Log.info(mathValueSymbol.getType().getDimensions().get(0).getTextualRepresentation(), "getAmount");
//Log.info(mathValueSymbol.getType().getDimensions().get(1).getTextualRepresentation(), "getAmount");
Log.info(name, "Name:");
Log.info(mathValueSymbol.getType().getDimensions().get(0).getTextualRepresentation(), "getAmount");
Log.info(mathValueSymbol.getType().getDimensions().get(1).getTextualRepresentation(), "getAmount");
try {
result = Integer.valueOf(numberString);
} catch (Exception ex) {
......@@ -102,9 +102,9 @@ public class MathInformationRegister {
Variable var = getVariable(name);
if (var != null) {
try {
//Log.info(name, "Name:");
//Log.info(var.getDimensionalInformation().get(0), "getAmount");
//Log.info(var.getDimensionalInformation().get(1), "getAmount");
Log.info(name, "Name:");
Log.info(var.getDimensionalInformation().get(0), "getAmount");
Log.info(var.getDimensionalInformation().get(1), "getAmount");
result = Integer.valueOf(var.getDimensionalInformation().get(dimension));
} catch (Exception ex) {
......@@ -119,7 +119,7 @@ public class MathInformationRegister {
}
public int getAmountColumns(String name) {
return getAmount(name, 0);
return getAmount(name, 1);
}
public int getAmountColumns(String name, MathMatrixAccessOperatorSymbol mathMatrixAccessOperatorSymbol) {
......@@ -132,7 +132,7 @@ public class MathInformationRegister {
if (secondDoubleDot)
result = 1;
else {
result = getAmount(name, 0);
result = getAmount(name, 1);
}
return result;
}
......
......@@ -17,12 +17,12 @@ find_package(${var.packageName} <#if var.required>REQUIRED<#else></#if>)
# additional library linkage
<#list viewModel.cmakeLibraryLinkageList as cmd>
set(LIBS "${LIBS}" ${cmd})
set(LIBS ${r"${LIBS}"} ${cmd})
</#list>
# additional commands
<#list viewModel.cmakeCommandList as cmd>
${cmd}
${cmd}
</#list>
# create static library
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment