Merge branch 'master' of github.com:Data2Dynamics/d2d

Data2Dynamics · Apr 30, 2024 · db161d1 · db161d1
2 parents 28e5208 + 1a82e5b
commit db161d1
Show file tree

Hide file tree

Showing 21 changed files with 818 additions and 355 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Data2Dynamics Software
 
-**Contact:** Andreas Raue - <andreas.raue@fdm.uni-freiburg.de>
+**Contact:** Andreas Raue - <andreas.raue@uni-a.de>
 (for support issues, please use the issues and forum, thanks!)
 
 **Cite:** 

diff --git a/arFramework3/Advanced/arCreateDataStruct.m b/arFramework3/Advanced/arCreateDataStruct.m
@@ -161,8 +161,12 @@
 D.fp = transpose(D.p);
 
 % execute substitutions from ar.model.p/ar.model.fp
-[int, iA, iB] = intersect(D.fp, ar.model.p);
-D.fp(iA) = ar.model.fp(iB);
+% try
+    [int, iA, iB] = intersect(D.fp, ar.model(m).p);
+% catch
+%     ar.model.p
+% end
+D.fp(iA) = ar.model(m).fp(iB);
 
 %% now replace fp which was provided as function argument:
 [~,ia,ib] = intersect(D.p,pold);

diff --git a/arFramework3/Advanced/arFindInputs.m b/arFramework3/Advanced/arFindInputs.m
@@ -61,7 +61,7 @@
 
                 for c = 1 : length( step1 )
                     ar.model(m).condition(a).fu{b}(step1(c):end);
-                    chk = strsplit(ar.model(m).condition(a).fu{b}(step1(c):end),',');
+                    chk = strsplit(ar.model(m).condition(a).fu{b}(step1(c):end),',')
                     stepLocations{end+1} = chk{3}; %#ok
                 end
                 for c = 1 : length( step2 )