From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 8 Sep 2014 11:27:01 +0000 (+0000)
Subject: Partial update of arrays was broken
X-Git-Tag: v1.29.0~188
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=7b6e66f1060bf4ba79eb584a40104e306c513017;p=simantics%2Fsysdyn.git

Partial update of arrays was broken
refs #5224

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@30229 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
index 12ffdf4f..e7b1959d 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
@@ -503,4 +503,37 @@ public class Array implements IExpression {
 		return subscript(environment, subscripts, 0);
 	}
 
+	public void applyPartial(Array[] indices, Array value, int pos) {
+		Array arr = indices[pos];
+		if(Array.FULL == arr) {
+			for(int i=0;i<elements.size();i++) {
+				if(pos < (indices.length-1)) {
+					((Array)elements.get(i)).applyPartial(indices, (Array)value.element(i), pos+1);
+				} else {
+					elements.set(i, value.element(i));
+				}
+			}
+		} else if(arr.dimension() == 1) {
+			int index = ((Double)arr.element(0)).intValue();
+			if(pos < (indices.length-1)) {
+				((Array)elements.get(index)).applyPartial(indices, value, pos+1);
+			} else {
+				elements.set(index, (Array)value.element(index));
+			}
+		} else {
+			for(Object element : arr.elements) {
+				int i = ((Double)element).intValue();
+				if(pos < (indices.length-1)) {
+					((Array)elements.get(i)).applyPartial(indices, (Array)value.element(i), pos+1);
+				} else {
+					elements.set(i, value.element(i));
+				}
+			}
+		}
+	}
+
+	public void applyPartial(Array[] indices, Array value) {
+		applyPartial(indices, value, 0);
+	}
+
 }
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
index 05ac71fd..2f28d4b8 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
@@ -170,7 +170,14 @@ public class Variable implements IExpression {
 		
 		if(value instanceof Array) {
 			if(base.isStoredAsArray(env)) {
-				env.put(base.index(env, subscripts), value);
+				if(SolverUtils.isFullSubscript(subscripts)) {
+					env.put(base.index(env, subscripts), value);
+				} else {
+					Array[] indices = SolverUtils.parseSubscripts(env, subscripts);
+					Array current = (Array)env.getValue(base.index);
+					current.applyPartial(indices, (Array)value);
+					env.put(base.index, current);
+				}
 			} else {
 				assignArray(env, base.index(env, subscripts), (Array)value, 0);
 			}
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
index 40c75d2d..e18fc45d 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
@@ -212,11 +212,14 @@ public class VariableBase {
 		
 		if(isStoredAsArray(environment)) {
 			
-			Array array = (Array)environment.getValue(index);
-			if(subscripts != null) {
-				return array.subscript(environment, subscripts);
+			Object value = environment.getValue(index);
+			if(value instanceof Array) {
+				Array array = (Array)value;
+				if(subscripts != null) {
+					return array.subscript(environment, subscripts);
+				}
 			}
-			else return array;
+			return value;
 			
 		} else {