++
добавление учета пробелов в сравнение
This commit is contained in:
@@ -39,14 +39,6 @@ public class AlignRule {
|
||||
alignRuleWith.add(new AlignRuleWidthJson(dimNum, a, b));
|
||||
}
|
||||
}
|
||||
public void Init(){
|
||||
//--
|
||||
alignArray_address = new BigInteger(packedAlignArrayAddress);
|
||||
alignWith_address = new BigInteger(packedAlignWithAddress);
|
||||
//--
|
||||
packedAlignArrayAddress = null;
|
||||
packedAlignWithAddress = null;
|
||||
}
|
||||
private static Pair<String, String> convertDigitToPositive(int digit) {
|
||||
String buf = "";
|
||||
String sign = " + ";
|
||||
@@ -58,6 +50,14 @@ public class AlignRule {
|
||||
buf += String.valueOf(digit);
|
||||
return new Pair<>(sign, buf);
|
||||
}
|
||||
public void Init() {
|
||||
//--
|
||||
alignArray_address = new BigInteger(packedAlignArrayAddress);
|
||||
alignWith_address = new BigInteger(packedAlignWithAddress);
|
||||
//--
|
||||
packedAlignArrayAddress = null;
|
||||
packedAlignWithAddress = null;
|
||||
}
|
||||
public ProjectArray getAlignArray() {
|
||||
return parent_region.arraysMap.get(alignArray_address);
|
||||
}
|
||||
@@ -115,7 +115,7 @@ public class AlignRule {
|
||||
retVal += getAlignArray().TypeString() + " ";
|
||||
arrayString += getAlignArray().shortName + "(";
|
||||
for (int i = 0; i < alignRule.size(); ++i) {
|
||||
arrayString += genStringExpr(ProjectArray.alignNames[i], alignRule.get(i).getKey(),alignRule.get(i).getValue() );
|
||||
arrayString += genStringExpr(ProjectArray.alignNames[i], alignRule.get(i).getKey(), alignRule.get(i).getValue());
|
||||
if (i != alignRule.size() - 1)
|
||||
arrayString += ",";
|
||||
}
|
||||
@@ -142,7 +142,7 @@ public class AlignRule {
|
||||
for (int i = 0; i < alignRuleWith.size(); ++i) {
|
||||
if (alignRuleWith.get(i).getDimNum() != -1) {
|
||||
alignEachDim.set(alignRuleWith.get(i).getDimNum(),
|
||||
genStringExpr(ProjectArray.alignNames[i], alignRuleWith.get(i).getA(),alignRuleWith.get(i).getB() ));
|
||||
genStringExpr(ProjectArray.alignNames[i], alignRuleWith.get(i).getA(), alignRuleWith.get(i).getB()));
|
||||
//коэццициенты находятся здесь!!------------------------------------------------------------------->>
|
||||
getAlignArray().ac_current.put(i,
|
||||
new Dimension(i,
|
||||
|
||||
Reference in New Issue
Block a user