From 49725cd708876e3d84cfaa7fae0a24ca31761610 Mon Sep 17 00:00:00 2001
From: khouzami <khouzami.nesrine@gmail.com>
Date: Thu, 19 Nov 2020 16:51:40 +0100
Subject: [PATCH] working on declarative aprroach and syntax imrpovement #67
 and #65

---
 .../generator/template/main@generator.mps     | 318 +++++++++++++++-
 languages/openpme.core/models/editor.mps      |  25 ++
 .../models/openpme.core.actions.mps           | 358 ++++++++++++++++++
 languages/openpme.core/models/structure.mps   |  22 ++
 .../TestSolution/models/declarative2.mps      | 153 ++++----
 .../models/particle_optimized.mps             |   5 +-
 6 files changed, 772 insertions(+), 109 deletions(-)
 create mode 100644 languages/openpme.core/models/openpme.core.actions.mps

diff --git a/languages/openpme.core/generator/template/main@generator.mps b/languages/openpme.core/generator/template/main@generator.mps
index 9af5e817..962c026d 100644
--- a/languages/openpme.core/generator/template/main@generator.mps
+++ b/languages/openpme.core/generator/template/main@generator.mps
@@ -16,9 +16,22 @@
   <registry>
     <language id="66673400-467e-48d2-ace0-6f708d2ef66d" name="openpme.core">
       <concept id="3375603839768458152" name="openpme.core.structure.MeshLoop" flags="ng" index="2l3RTA" />
+      <concept id="1387474872151071397" name="openpme.core.structure.Norm2" flags="ng" index="2q6huI">
+        <child id="1387474872151071415" name="parameter" index="2q6huW" />
+      </concept>
+      <concept id="1387474872151359155" name="openpme.core.structure.CutoffRef" flags="ng" index="2q7veS" />
       <concept id="1387474872145899071" name="openpme.core.structure.UpdateCellList" flags="ng" index="2qi2cO" />
       <concept id="1387474872146285163" name="openpme.core.structure.PropertyReference" flags="ng" index="2qjxXw" />
       <concept id="1387474872146533755" name="openpme.core.structure.PointType" flags="ng" index="2qk_1K" />
+      <concept id="1387474872146957942" name="openpme.core.structure.NeighborListType" flags="ng" index="2qmdHX" />
+      <concept id="1387474872146868238" name="openpme.core.structure.CreateNeighborList" flags="ng" index="2qmnk5">
+        <child id="1387474872146868239" name="ref" index="2qmnk4" />
+        <child id="1387474872146868241" name="position" index="2qmnkq" />
+      </concept>
+      <concept id="1387474872154696612" name="openpme.core.structure.NeighborhoodLoop" flags="ng" index="2qNIqJ">
+        <child id="1387474872154696614" name="iterable" index="2qNIqH" />
+        <child id="1387474872154696613" name="particle" index="2qNIqI" />
+      </concept>
       <concept id="1387474872142997143" name="openpme.core.structure.ParticlePositionAccess" flags="ng" index="2rB6Is">
         <child id="1387474872142997146" name="ref" index="2rB6Ih" />
       </concept>
@@ -132,11 +145,14 @@
     <language id="9a51a2b4-83e4-4324-8cf8-4ee101121a3a" name="openpme.expressions">
       <concept id="2202684092512217962" name="openpme.expressions.structure.PlusAssignmentExpression" flags="ng" index="o2qFD" />
       <concept id="1387474872151759130" name="openpme.expressions.structure.PowerExpression" flags="ng" index="2q8Tgh" />
+      <concept id="1387474872145762371" name="openpme.expressions.structure.DoubleType" flags="ng" index="2qhxl8" />
       <concept id="8275820577561349363" name="openpme.expressions.structure.BinaryExpression" flags="ng" index="2$G184">
         <child id="8275820577561349366" name="left" index="2$G181" />
         <child id="8275820577561349370" name="right" index="2$G18d" />
       </concept>
       <concept id="8275820577561349375" name="openpme.expressions.structure.AssignmentExpression" flags="ng" index="2$G188" />
+      <concept id="8275820577561364933" name="openpme.expressions.structure.EqualsExpression" flags="ng" index="2$G5sM" />
+      <concept id="8275820577561364937" name="openpme.expressions.structure.GreaterExpression" flags="ng" index="2$G5sY" />
       <concept id="8275820577561417723" name="openpme.expressions.structure.DecimalLiteral" flags="ng" index="2$GK$c">
         <property id="8275820577561417724" name="value" index="2$GK$b" />
       </concept>
@@ -247,6 +263,7 @@
       <concept id="1217004708011" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetInputModel" flags="nn" index="1r8y6K" />
     </language>
     <language id="d89a1f94-2b10-40d1-a01e-560f94e501d7" name="openpme.statements">
+      <concept id="1387474872148681594" name="openpme.statements.structure.SkipIteration" flags="ng" index="2qsETL" />
       <concept id="196114789556629018" name="openpme.statements.structure.VariableDeclaration" flags="ng" index="2G0pd6">
         <child id="8073773260958243017" name="init" index="1wvlr8" />
       </concept>
@@ -257,6 +274,10 @@
       <concept id="8073773260958208202" name="openpme.statements.structure.ExpressionStatement" flags="ng" index="1wvtVb">
         <child id="8073773260958208203" name="expression" index="1wvtVa" />
       </concept>
+      <concept id="5443610339528609787" name="openpme.statements.structure.IfStatement" flags="ng" index="1GH9$S">
+        <child id="8073773260958208287" name="condition" index="1wvtWu" />
+        <child id="8073773260958208289" name="ifTrue" index="1wvtWw" />
+      </concept>
       <concept id="2579446515047575999" name="openpme.statements.structure.VariableReference" flags="ng" index="1XiV_f">
         <reference id="2579446515047620994" name="variableDeclaration" index="1Xh6_M" />
       </concept>
@@ -571,6 +592,12 @@
         <ref role="v9R2y" node="57hfxDvCGMh" resolve="reduce_Interact" />
       </node>
     </node>
+    <node concept="3aamgX" id="2xYujawj14e" role="3acgRq">
+      <ref role="30HIoZ" to="r2co:2xYujawbBJS" resolve="ParticleDistance" />
+      <node concept="j$656" id="2xYujawj17z" role="1lVwrX">
+        <ref role="v9R2y" node="2xYujawj17x" resolve="reduce_ParticleDistance" />
+      </node>
+    </node>
     <node concept="1puMqW" id="57hfxDvERcW" role="1puA0r">
       <ref role="1puQsG" node="57hfxDvCJ1C" resolve="add_cellList" />
     </node>
@@ -579,6 +606,11 @@
       <ref role="2rTdP9" to="r2co:1MYyjtFOOxy" resolve="Particle" />
       <ref role="2rZz_L" to="5oki:aSJlMIIiSq" resolve="VariableDeclaration" />
     </node>
+    <node concept="2rT7sh" id="2xYujawj0T8" role="2rTMjI">
+      <property role="TrG5h" value="distanceInteract" />
+      <ref role="2rTdP9" to="r2co:57hfxDvvsXv" resolve="Interact" />
+      <ref role="2rZz_L" to="5oki:aSJlMIIiSq" resolve="VariableDeclaration" />
+    </node>
   </node>
   <node concept="jVnub" id="drzFVJKILG">
     <property role="TrG5h" value="switch_Curl3D" />
@@ -8523,6 +8555,218 @@
             </node>
           </node>
         </node>
+        <node concept="2G0pd6" id="2xYujaw8kt9" role="oWeDG">
+          <property role="TrG5h" value="nlist" />
+          <node concept="2qmdHX" id="2xYujaw8kvW" role="1wvloH" />
+          <node concept="2qmnk5" id="2xYujaw8kxe" role="1wvlr8">
+            <node concept="1XiV_f" id="2xYujaw8kxg" role="2qmnk4">
+              <node concept="1ZhdrF" id="2xYujaw8k$e" role="lGtFl">
+                <property role="2qtEX8" value="variableDeclaration" />
+                <property role="P3scX" value="d89a1f94-2b10-40d1-a01e-560f94e501d7/2579446515047575999/2579446515047620994" />
+                <node concept="3$xsQk" id="2xYujaw8k$f" role="3$ytzL">
+                  <node concept="3clFbS" id="2xYujaw8k$g" role="2VODD2">
+                    <node concept="3clFbF" id="2xYujaw8kDm" role="3cqZAp">
+                      <node concept="2OqwBi" id="2xYujaw8ltT" role="3clFbG">
+                        <node concept="1iwH7S" id="2xYujaw8l25" role="2Oq$k0" />
+                        <node concept="1iwH70" id="2xYujaw8lzP" role="2OqNvi">
+                          <ref role="1iwH77" node="57hfxDvGiWL" resolve="cellListDeclaration" />
+                          <node concept="1PxgMI" id="2xYujaw8npz" role="1iwH7V">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="2xYujaw8nsB" role="3oSUPX">
+                              <ref role="cht4Q" to="r2co:1MYyjtFOOxy" resolve="Particle" />
+                            </node>
+                            <node concept="2OqwBi" id="2xYujaw8mMa" role="1m5AlR">
+                              <node concept="2OqwBi" id="2xYujaw8miz" role="2Oq$k0">
+                                <node concept="30H73N" id="2xYujaw8m5b" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="2xYujaw8mw6" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="r2co:57hfxDvvti4" resolve="container" />
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="2xYujaw8n5q" role="2OqNvi">
+                                <ref role="3Tt5mk" to="5oki:2fc2f1uy662" resolve="variableDeclaration" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1XiV_f" id="2xYujaw8nDl" role="2qmnkq">
+              <ref role="1Xh6_M" node="57hfxDvM6HA" resolve="selfPosition" />
+            </node>
+          </node>
+        </node>
+        <node concept="2qNIqJ" id="2xYujaw9OhL" role="oWeDG">
+          <node concept="1XiV_f" id="2xYujaw9OyP" role="2qNIqH">
+            <ref role="1Xh6_M" node="2xYujaw8kt9" resolve="nlist" />
+          </node>
+          <node concept="2G0pd6" id="2xYujaw9On4" role="2qNIqI">
+            <node concept="29HgVG" id="2xYujaw9OrB" role="lGtFl">
+              <node concept="3NFfHV" id="2xYujaw9OrC" role="3NFExx">
+                <node concept="3clFbS" id="2xYujaw9OrD" role="2VODD2">
+                  <node concept="3clFbF" id="2xYujaw9OrJ" role="3cqZAp">
+                    <node concept="2OqwBi" id="2xYujaw9OrE" role="3clFbG">
+                      <node concept="3TrEf2" id="2xYujaw9OrH" role="2OqNvi">
+                        <ref role="3Tt5mk" to="r2co:57hfxDvwVo9" resolve="neighbor_particle" />
+                      </node>
+                      <node concept="30H73N" id="2xYujaw9OrI" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1GH9$S" id="2xYujawanh$" role="oWeDG">
+            <node concept="1wvtUh" id="2xYujawanhA" role="1wvtWw">
+              <node concept="2qsETL" id="2xYujawaoR0" role="1wvtUr" />
+            </node>
+            <node concept="2$G5sM" id="2xYujawannd" role="1wvtWu">
+              <node concept="1XiV_f" id="2xYujawanoz" role="2$G181">
+                <node concept="1ZhdrF" id="2xYujawanpB" role="lGtFl">
+                  <property role="2qtEX8" value="variableDeclaration" />
+                  <property role="P3scX" value="d89a1f94-2b10-40d1-a01e-560f94e501d7/2579446515047575999/2579446515047620994" />
+                  <node concept="3$xsQk" id="2xYujawanpC" role="3$ytzL">
+                    <node concept="3clFbS" id="2xYujawanpD" role="2VODD2">
+                      <node concept="3clFbF" id="2xYujawansj" role="3cqZAp">
+                        <node concept="2OqwBi" id="2xYujawanEk" role="3clFbG">
+                          <node concept="30H73N" id="2xYujawansi" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="2xYujawao5r" role="2OqNvi">
+                            <ref role="3Tt5mk" to="r2co:57hfxDvwVkZ" resolve="self_particle" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1XiV_f" id="2xYujawaodF" role="2$G18d">
+                <node concept="1ZhdrF" id="2xYujawaois" role="lGtFl">
+                  <property role="2qtEX8" value="variableDeclaration" />
+                  <property role="P3scX" value="d89a1f94-2b10-40d1-a01e-560f94e501d7/2579446515047575999/2579446515047620994" />
+                  <node concept="3$xsQk" id="2xYujawaoit" role="3$ytzL">
+                    <node concept="3clFbS" id="2xYujawaoiu" role="2VODD2">
+                      <node concept="3clFbF" id="2xYujawaojM" role="3cqZAp">
+                        <node concept="2OqwBi" id="2xYujawaotJ" role="3clFbG">
+                          <node concept="30H73N" id="2xYujawaojL" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="2xYujawaoGT" role="2OqNvi">
+                            <ref role="3Tt5mk" to="r2co:57hfxDvwVo9" resolve="neighbor_particle" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2G0pd6" id="2xYujawap8j" role="oWeDG">
+            <property role="TrG5h" value="neighborPosition" />
+            <node concept="2qk_1K" id="2xYujawapbK" role="1wvloH" />
+            <node concept="2rB6Is" id="2xYujawapfB" role="1wvlr8">
+              <node concept="1XiV_f" id="2xYujawapfD" role="2rB6Ih">
+                <node concept="1ZhdrF" id="2xYujawapg3" role="lGtFl">
+                  <property role="2qtEX8" value="variableDeclaration" />
+                  <property role="P3scX" value="d89a1f94-2b10-40d1-a01e-560f94e501d7/2579446515047575999/2579446515047620994" />
+                  <node concept="3$xsQk" id="2xYujawapg4" role="3$ytzL">
+                    <node concept="3clFbS" id="2xYujawapg5" role="2VODD2">
+                      <node concept="3clFbF" id="2xYujawaph5" role="3cqZAp">
+                        <node concept="2OqwBi" id="2xYujawapr2" role="3clFbG">
+                          <node concept="30H73N" id="2xYujawaph4" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="2xYujawapBh" role="2OqNvi">
+                            <ref role="3Tt5mk" to="r2co:57hfxDvwVo9" resolve="neighbor_particle" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2G0pd6" id="2xYujawapQj" role="oWeDG">
+            <property role="TrG5h" value="distance" />
+            <node concept="2qhxl8" id="2xYujawapV6" role="1wvloH" />
+            <node concept="37xRux" id="2xYujawapYV" role="1wvlr8">
+              <node concept="1XiV_f" id="2xYujawapZV" role="2$G181">
+                <ref role="1Xh6_M" node="57hfxDvM6HA" resolve="selfPosition" />
+              </node>
+              <node concept="1XiV_f" id="2xYujawaq0y" role="2$G18d">
+                <ref role="1Xh6_M" node="2xYujawap8j" resolve="neighborPosition" />
+              </node>
+            </node>
+            <node concept="2ZBi8u" id="2xYujawj12u" role="lGtFl">
+              <ref role="2rW$FS" node="2xYujawj0T8" resolve="distanceInteract" />
+            </node>
+          </node>
+          <node concept="1GH9$S" id="2xYujawap1y" role="oWeDG">
+            <node concept="2$G5sY" id="2xYujawaq1V" role="1wvtWu">
+              <node concept="2q8Tgh" id="2xYujawaquI" role="2$G18d">
+                <node concept="2q7veS" id="2xYujawaqvw" role="2$G181">
+                  <node concept="1ZhdrF" id="2xYujawaqw3" role="lGtFl">
+                    <property role="2qtEX8" value="ref" />
+                    <property role="P3scX" value="66673400-467e-48d2-ace0-6f708d2ef66d/1387474872151359155/1387474872151359156" />
+                    <node concept="3$xsQk" id="2xYujawaqw4" role="3$ytzL">
+                      <node concept="3clFbS" id="2xYujawaqw5" role="2VODD2">
+                        <node concept="3clFbF" id="2xYujawaqx5" role="3cqZAp">
+                          <node concept="2OqwBi" id="2xYujawawwW" role="3clFbG">
+                            <node concept="2OqwBi" id="2xYujawauK_" role="2Oq$k0">
+                              <node concept="2OqwBi" id="2xYujawat0O" role="2Oq$k0">
+                                <node concept="30H73N" id="2xYujawasMB" role="2Oq$k0" />
+                                <node concept="2Xjw5R" id="2xYujawaw1H" role="2OqNvi">
+                                  <node concept="1xMEDy" id="2xYujawaw1J" role="1xVPHs">
+                                    <node concept="chp4Y" id="2xYujawaw4P" role="ri$Ld">
+                                      <ref role="cht4Q" to="3x5m:4Ib_GcBfRUO" resolve="Module" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="2xYujawawgV" role="2OqNvi">
+                                <ref role="3Tt5mk" to="3x5m:4Ib_GcBfRUP" resolve="initialization" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="2xYujawawFD" role="2OqNvi">
+                              <ref role="3Tt5mk" to="3x5m:6z0p_feMfSH" resolve="cutoff_radius" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2$GKAY" id="2xYujawawU6" role="2$G18d">
+                  <property role="2$GKAX" value="2" />
+                </node>
+              </node>
+              <node concept="2q6huI" id="2xYujawj087" role="2$G181">
+                <node concept="1XiV_f" id="2xYujawj0a0" role="2q6huW">
+                  <ref role="1Xh6_M" node="2xYujawapQj" resolve="distance" />
+                </node>
+              </node>
+            </node>
+            <node concept="1wvtUh" id="2xYujawap1A" role="1wvtWw">
+              <node concept="2qsETL" id="2xYujawb3Ow" role="1wvtUr" />
+            </node>
+          </node>
+          <node concept="37xPp2" id="2xYujawb3OS" role="oWeDG">
+            <node concept="2b32R4" id="2xYujawb44Y" role="lGtFl">
+              <node concept="3JmXsc" id="2xYujawb451" role="2P8S$">
+                <node concept="3clFbS" id="2xYujawb452" role="2VODD2">
+                  <node concept="3clFbF" id="2xYujawb458" role="3cqZAp">
+                    <node concept="2OqwBi" id="2xYujawb453" role="3clFbG">
+                      <node concept="3Tsc0h" id="2xYujawb456" role="2OqNvi">
+                        <ref role="3TtcxE" to="r2co:57hfxDvvyeo" resolve="body" />
+                      </node>
+                      <node concept="30H73N" id="2xYujawb457" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="1XiV_f" id="57hfxDvM4tC" role="Gx2hT">
           <node concept="29HgVG" id="57hfxDvM630" role="lGtFl">
             <node concept="3NFfHV" id="57hfxDvM631" role="3NFExx">
@@ -8746,28 +8990,33 @@
                   <node concept="2OqwBi" id="57hfxDvFrHc" role="tz02z">
                     <node concept="1iwH7S" id="57hfxDvFrzq" role="2Oq$k0" />
                     <node concept="2piZGk" id="57hfxDvFrMo" role="2OqNvi">
-                      <node concept="2OqwBi" id="57hfxDvFstw" role="2piZGb">
-                        <node concept="1PxgMI" id="57hfxDvFrU4" role="2Oq$k0">
-                          <property role="1BlNFB" value="true" />
-                          <node concept="chp4Y" id="57hfxDvFrU5" role="3oSUPX">
-                            <ref role="cht4Q" to="r2co:1MYyjtFOOxy" resolve="Particle" />
-                          </node>
-                          <node concept="2OqwBi" id="57hfxDvFrU6" role="1m5AlR">
-                            <node concept="2OqwBi" id="57hfxDvFrU7" role="2Oq$k0">
-                              <node concept="2GrUjf" id="57hfxDvFrU8" role="2Oq$k0">
-                                <ref role="2Gs0qQ" node="57hfxDvFoIb" resolve="interact" />
+                      <node concept="3cpWs3" id="2xYujaw9gzX" role="2piZGb">
+                        <node concept="Xl_RD" id="2xYujaw9gBb" role="3uHU7w">
+                          <property role="Xl_RC" value="_cellList" />
+                        </node>
+                        <node concept="2OqwBi" id="57hfxDvFstw" role="3uHU7B">
+                          <node concept="1PxgMI" id="57hfxDvFrU4" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="57hfxDvFrU5" role="3oSUPX">
+                              <ref role="cht4Q" to="r2co:1MYyjtFOOxy" resolve="Particle" />
+                            </node>
+                            <node concept="2OqwBi" id="57hfxDvFrU6" role="1m5AlR">
+                              <node concept="2OqwBi" id="57hfxDvFrU7" role="2Oq$k0">
+                                <node concept="2GrUjf" id="57hfxDvFrU8" role="2Oq$k0">
+                                  <ref role="2Gs0qQ" node="57hfxDvFoIb" resolve="interact" />
+                                </node>
+                                <node concept="3TrEf2" id="57hfxDvFrU9" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="r2co:57hfxDvvti4" resolve="container" />
+                                </node>
                               </node>
-                              <node concept="3TrEf2" id="57hfxDvFrU9" role="2OqNvi">
-                                <ref role="3Tt5mk" to="r2co:57hfxDvvti4" resolve="container" />
+                              <node concept="3TrEf2" id="57hfxDvFrUa" role="2OqNvi">
+                                <ref role="3Tt5mk" to="5oki:2fc2f1uy662" resolve="variableDeclaration" />
                               </node>
                             </node>
-                            <node concept="3TrEf2" id="57hfxDvFrUa" role="2OqNvi">
-                              <ref role="3Tt5mk" to="5oki:2fc2f1uy662" resolve="variableDeclaration" />
-                            </node>
                           </node>
-                        </node>
-                        <node concept="3TrcHB" id="57hfxDvFsVG" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          <node concept="3TrcHB" id="57hfxDvFsVG" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -8982,5 +9231,38 @@
       </node>
     </node>
   </node>
+  <node concept="13MO4I" id="2xYujawj17x">
+    <property role="TrG5h" value="reduce_ParticleDistance" />
+    <ref role="3gUMe" to="r2co:2xYujawbBJS" resolve="ParticleDistance" />
+    <node concept="1XiV_f" id="2xYujawj1bR" role="13RCb5">
+      <node concept="raruj" id="2xYujawj1c_" role="lGtFl" />
+      <node concept="1ZhdrF" id="2xYujawj1dD" role="lGtFl">
+        <property role="2qtEX8" value="variableDeclaration" />
+        <property role="P3scX" value="d89a1f94-2b10-40d1-a01e-560f94e501d7/2579446515047575999/2579446515047620994" />
+        <node concept="3$xsQk" id="2xYujawj1dE" role="3$ytzL">
+          <node concept="3clFbS" id="2xYujawj1dF" role="2VODD2">
+            <node concept="3clFbF" id="2xYujawj1fz" role="3cqZAp">
+              <node concept="2OqwBi" id="2xYujawj1rR" role="3clFbG">
+                <node concept="1iwH7S" id="2xYujawj1fy" role="2Oq$k0" />
+                <node concept="1iwH70" id="2xYujawj1xC" role="2OqNvi">
+                  <ref role="1iwH77" node="2xYujawj0T8" resolve="distanceInteract" />
+                  <node concept="2OqwBi" id="2xYujawj2om" role="1iwH7V">
+                    <node concept="30H73N" id="2xYujawj1EM" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="2xYujawj2$Q" role="2OqNvi">
+                      <node concept="1xMEDy" id="2xYujawj2$S" role="1xVPHs">
+                        <node concept="chp4Y" id="2xYujawj2Dt" role="ri$Ld">
+                          <ref role="cht4Q" to="r2co:57hfxDvvsXv" resolve="Interact" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/languages/openpme.core/models/editor.mps b/languages/openpme.core/models/editor.mps
index 84e10e1b..db7fdecf 100644
--- a/languages/openpme.core/models/editor.mps
+++ b/languages/openpme.core/models/editor.mps
@@ -1793,5 +1793,30 @@
       <node concept="l2Vlx" id="57hfxDvAWMn" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="2xYujawbBOh">
+    <property role="3GE5qa" value="simulation.expressions" />
+    <ref role="1XX52x" to="r2co:2xYujawbBJS" resolve="ParticleDistance" />
+    <node concept="3EZMnI" id="2xYujawbBOD" role="2wV5jI">
+      <node concept="3F0ifn" id="2xYujawbBOK" role="3EZMnx">
+        <property role="3F0ifm" value="d" />
+      </node>
+      <node concept="3F0ifn" id="2xYujawbHDI" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+      </node>
+      <node concept="3F1sOY" id="2xYujawbHEn" role="3EZMnx">
+        <ref role="1NtTu8" to="r2co:2xYujawbH_O" resolve="self" />
+      </node>
+      <node concept="3F0ifn" id="2xYujawbHER" role="3EZMnx">
+        <property role="3F0ifm" value="," />
+      </node>
+      <node concept="3F1sOY" id="2xYujawbHFe" role="3EZMnx">
+        <ref role="1NtTu8" to="r2co:2xYujawbHBe" resolve="neighbor" />
+      </node>
+      <node concept="3F0ifn" id="2xYujawbHFM" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+      </node>
+      <node concept="l2Vlx" id="2xYujawbBOG" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/languages/openpme.core/models/openpme.core.actions.mps b/languages/openpme.core/models/openpme.core.actions.mps
new file mode 100644
index 00000000..b12ce115
--- /dev/null
+++ b/languages/openpme.core/models/openpme.core.actions.mps
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:cc430c74-b9a5-4c03-8ef0-2319dae775e8(openpme.core.actions)">
+  <persistence version="9" />
+  <languages>
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="r2co" ref="r:15616bdb-5f06-41a2-ba85-ee0c68a0d3dd(openpme.core.structure)" implicit="true" />
+    <import index="5oki" ref="r:ebc5ff6c-54ad-44cc-986b-956c5e8ea76e(openpme.statements.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
+        <reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
+      </concept>
+    </language>
+    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
+      <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
+      <concept id="1158700664498" name="jetbrains.mps.lang.actions.structure.NodeFactories" flags="ng" index="37WguZ">
+        <child id="1158700779049" name="nodeFactory" index="37WGs$" />
+      </concept>
+      <concept id="1158700725281" name="jetbrains.mps.lang.actions.structure.NodeFactory" flags="ig" index="37WvkG">
+        <reference id="1158700943156" name="applicableConcept" index="37XkoT" />
+        <child id="1158701448518" name="setupFunction" index="37ZfLb" />
+      </concept>
+      <concept id="1158701162220" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction" flags="in" index="37Y9Zx" />
+      <concept id="5584396657084912703" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_NewNode" flags="nn" index="1r4Lsj" />
+      <concept id="5584396657084920670" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_EnclosingNode" flags="nn" index="1r4N1M" />
+      <concept id="5584396657084920413" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_SampleNode" flags="nn" index="1r4N5L" />
+    </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
+        <property id="6332851714983843871" name="severity" index="2xdLsb" />
+        <child id="5721587534047265374" name="message" index="9lYJi" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
+      <concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
+        <reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
+        <child id="1883223317721008709" name="body" index="Jncv$" />
+        <child id="1883223317721008711" name="variable" index="JncvA" />
+        <child id="1883223317721008710" name="nodeExpression" index="JncvB" />
+      </concept>
+      <concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
+      <concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
+        <property id="709746936026609031" name="linkId" index="3V$3ak" />
+        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
+      </concept>
+      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
+        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="37WguZ" id="2xYujawbHvW">
+    <property role="3GE5qa" value="simulation.expressions" />
+    <property role="TrG5h" value="distanceFactory" />
+    <node concept="37WvkG" id="2xYujawbHvX" role="37WGs$">
+      <ref role="37XkoT" to="r2co:2xYujawbBJS" resolve="ParticleDistance" />
+      <node concept="37Y9Zx" id="2xYujawbHxa" role="37ZfLb">
+        <node concept="3clFbS" id="2xYujawbHxb" role="2VODD2">
+          <node concept="1X3_iC" id="2xYujawiYkt" role="lGtFl">
+            <property role="3V$3am" value="statement" />
+            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+            <node concept="2xdQw9" id="2xYujawcnfK" role="8Wnug">
+              <property role="2xdLsb" value="h1akgim/info" />
+              <node concept="Xl_RD" id="2xYujawcnfM" role="9lYJi">
+                <property role="Xl_RC" value="node factory distance" />
+              </node>
+            </node>
+          </node>
+          <node concept="1X3_iC" id="2xYujawiY_o" role="lGtFl">
+            <property role="3V$3am" value="statement" />
+            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+            <node concept="2xdQw9" id="2xYujawfDzK" role="8Wnug">
+              <property role="2xdLsb" value="h1akgim/info" />
+              <node concept="3cpWs3" id="2xYujawfE38" role="9lYJi">
+                <node concept="1r4N1M" id="2xYujawfE3L" role="3uHU7w" />
+                <node concept="Xl_RD" id="2xYujawfDzM" role="3uHU7B">
+                  <property role="Xl_RC" value="enclosing node outside" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1X3_iC" id="2xYujawiYDp" role="lGtFl">
+            <property role="3V$3am" value="statement" />
+            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+            <node concept="2xdQw9" id="2xYujawfEkt" role="8Wnug">
+              <property role="2xdLsb" value="h1akgim/info" />
+              <node concept="3cpWs3" id="2xYujawfEku" role="9lYJi">
+                <node concept="1r4N5L" id="2xYujawgc$Y" role="3uHU7w" />
+                <node concept="Xl_RD" id="2xYujawfEkw" role="3uHU7B">
+                  <property role="Xl_RC" value="sample node inside" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1X3_iC" id="2xYujawiYHr" role="lGtFl">
+            <property role="3V$3am" value="statement" />
+            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+            <node concept="2xdQw9" id="2xYujawgK0e" role="8Wnug">
+              <property role="2xdLsb" value="h1akgim/info" />
+              <node concept="3cpWs3" id="2xYujawgK0f" role="9lYJi">
+                <node concept="1r4Lsj" id="2xYujawgKfp" role="3uHU7w" />
+                <node concept="Xl_RD" id="2xYujawgK0h" role="3uHU7B">
+                  <property role="Xl_RC" value="new node" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2xYujawhQer" role="3cqZAp" />
+          <node concept="3cpWs8" id="2xYujawhRdK" role="3cqZAp">
+            <node concept="3cpWsn" id="2xYujawhRdN" role="3cpWs9">
+              <property role="TrG5h" value="interact" />
+              <node concept="3Tqbb2" id="2xYujawhRdI" role="1tU5fm">
+                <ref role="ehGHo" to="r2co:57hfxDvvsXv" resolve="Interact" />
+              </node>
+              <node concept="2OqwBi" id="2xYujawhREC" role="33vP2m">
+                <node concept="1r4N1M" id="2xYujawhRy9" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="2xYujawhRKI" role="2OqNvi">
+                  <node concept="1xMEDy" id="2xYujawhRKK" role="1xVPHs">
+                    <node concept="chp4Y" id="2xYujawhRNb" role="ri$Ld">
+                      <ref role="cht4Q" to="r2co:57hfxDvvsXv" resolve="Interact" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2xYujawhQhb" role="3cqZAp">
+            <node concept="2OqwBi" id="2xYujawhQhc" role="3clFbG">
+              <node concept="2OqwBi" id="2xYujawhQhd" role="2Oq$k0">
+                <node concept="1r4Lsj" id="2xYujawhQhe" role="2Oq$k0" />
+                <node concept="3TrEf2" id="2xYujawhQhf" role="2OqNvi">
+                  <ref role="3Tt5mk" to="r2co:2xYujawbH_O" resolve="self" />
+                </node>
+              </node>
+              <node concept="2DeJnY" id="2xYujawhQhg" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="2xYujawhQhi" role="3cqZAp">
+            <node concept="2OqwBi" id="2xYujawhQhj" role="3clFbG">
+              <node concept="2OqwBi" id="2xYujawhQhk" role="2Oq$k0">
+                <node concept="1r4Lsj" id="2xYujawhQhl" role="2Oq$k0" />
+                <node concept="3TrEf2" id="2xYujawhQhm" role="2OqNvi">
+                  <ref role="3Tt5mk" to="r2co:2xYujawbHBe" resolve="neighbor" />
+                </node>
+              </node>
+              <node concept="2DeJnY" id="2xYujawhQhn" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="2xYujawhQho" role="3cqZAp">
+            <node concept="37vLTI" id="2xYujawhQhp" role="3clFbG">
+              <node concept="2OqwBi" id="2xYujawhQhq" role="37vLTx">
+                <node concept="3TrEf2" id="2xYujawhQhs" role="2OqNvi">
+                  <ref role="3Tt5mk" to="r2co:57hfxDvwVkZ" resolve="self_particle" />
+                </node>
+                <node concept="37vLTw" id="2xYujawhScV" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2xYujawhRdN" resolve="interact" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="2xYujawhQht" role="37vLTJ">
+                <node concept="2OqwBi" id="2xYujawhQhu" role="2Oq$k0">
+                  <node concept="1r4Lsj" id="2xYujawhQhv" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="2xYujawhQhw" role="2OqNvi">
+                    <ref role="3Tt5mk" to="r2co:2xYujawbH_O" resolve="self" />
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="2xYujawhQhx" role="2OqNvi">
+                  <ref role="3Tt5mk" to="5oki:2fc2f1uy662" resolve="variableDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2xYujawhQhy" role="3cqZAp">
+            <node concept="37vLTI" id="2xYujawhQhz" role="3clFbG">
+              <node concept="2OqwBi" id="2xYujawhQh$" role="37vLTx">
+                <node concept="3TrEf2" id="2xYujawhQhA" role="2OqNvi">
+                  <ref role="3Tt5mk" to="r2co:57hfxDvwVo9" resolve="neighbor_particle" />
+                </node>
+                <node concept="37vLTw" id="2xYujawhSiE" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2xYujawhRdN" resolve="interact" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="2xYujawhQhB" role="37vLTJ">
+                <node concept="2OqwBi" id="2xYujawhQhC" role="2Oq$k0">
+                  <node concept="1r4Lsj" id="2xYujawhQhD" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="2xYujawirMm" role="2OqNvi">
+                    <ref role="3Tt5mk" to="r2co:2xYujawbHBe" resolve="neighbor" />
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="2xYujawhQhF" role="2OqNvi">
+                  <ref role="3Tt5mk" to="5oki:2fc2f1uy662" resolve="variableDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2xYujawhQ3e" role="3cqZAp" />
+          <node concept="3clFbH" id="2xYujawhQ47" role="3cqZAp" />
+          <node concept="1X3_iC" id="2xYujawhQ7T" role="lGtFl">
+            <property role="3V$3am" value="statement" />
+            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+            <node concept="Jncv_" id="2xYujawbHyd" role="8Wnug">
+              <ref role="JncvD" to="r2co:57hfxDvvsXv" resolve="Interact" />
+              <node concept="3clFbS" id="2xYujawbHyf" role="Jncv$">
+                <node concept="3clFbH" id="2xYujawhPKD" role="3cqZAp" />
+                <node concept="3clFbH" id="2xYujawhQ09" role="3cqZAp" />
+                <node concept="3clFbF" id="2xYujawbHLJ" role="3cqZAp">
+                  <node concept="2OqwBi" id="2xYujawbIjn" role="3clFbG">
+                    <node concept="2OqwBi" id="2xYujawbHTJ" role="2Oq$k0">
+                      <node concept="1r4Lsj" id="2xYujawbHLI" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2xYujawbI2F" role="2OqNvi">
+                        <ref role="3Tt5mk" to="r2co:2xYujawbH_O" resolve="self" />
+                      </node>
+                    </node>
+                    <node concept="2DeJnY" id="2xYujawbII9" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3clFbH" id="2xYujawgJPf" role="3cqZAp" />
+                <node concept="3clFbF" id="2xYujawbIR$" role="3cqZAp">
+                  <node concept="2OqwBi" id="2xYujawbJlW" role="3clFbG">
+                    <node concept="2OqwBi" id="2xYujawbJ1X" role="2Oq$k0">
+                      <node concept="1r4Lsj" id="2xYujawbIRy" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2xYujawbJar" role="2OqNvi">
+                        <ref role="3Tt5mk" to="r2co:2xYujawbHBe" resolve="neighbor" />
+                      </node>
+                    </node>
+                    <node concept="2DeJnY" id="2xYujawbJnN" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2xYujawbJLA" role="3cqZAp">
+                  <node concept="37vLTI" id="2xYujawbKXt" role="3clFbG">
+                    <node concept="2OqwBi" id="2xYujawbLia" role="37vLTx">
+                      <node concept="Jnkvi" id="2xYujawbL4G" role="2Oq$k0">
+                        <ref role="1M0zk5" node="2xYujawbHyg" resolve="interact" />
+                      </node>
+                      <node concept="3TrEf2" id="2xYujawbLx7" role="2OqNvi">
+                        <ref role="3Tt5mk" to="r2co:57hfxDvwVkZ" resolve="self_particle" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="2xYujawbKm2" role="37vLTJ">
+                      <node concept="2OqwBi" id="2xYujawbJWy" role="2Oq$k0">
+                        <node concept="1r4Lsj" id="2xYujawbJL$" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="2xYujawbK5u" role="2OqNvi">
+                          <ref role="3Tt5mk" to="r2co:2xYujawbH_O" resolve="self" />
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="2xYujawbKzI" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5oki:2fc2f1uy662" resolve="variableDeclaration" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2xYujawbLCG" role="3cqZAp">
+                  <node concept="37vLTI" id="2xYujawbM_e" role="3clFbG">
+                    <node concept="2OqwBi" id="2xYujawbMTK" role="37vLTx">
+                      <node concept="Jnkvi" id="2xYujawbMCb" role="2Oq$k0">
+                        <ref role="1M0zk5" node="2xYujawbHyg" resolve="interact" />
+                      </node>
+                      <node concept="3TrEf2" id="2xYujawbNcV" role="2OqNvi">
+                        <ref role="3Tt5mk" to="r2co:57hfxDvwVo9" resolve="neighbor_particle" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="2xYujawbMb1" role="37vLTJ">
+                      <node concept="2OqwBi" id="2xYujawbLO$" role="2Oq$k0">
+                        <node concept="1r4Lsj" id="2xYujawbLCE" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="2xYujawbLXl" role="2OqNvi">
+                          <ref role="3Tt5mk" to="r2co:2xYujawbH_O" resolve="self" />
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="2xYujawbMoH" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5oki:2fc2f1uy662" resolve="variableDeclaration" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="2xYujawfDlg" role="3cqZAp" />
+              </node>
+              <node concept="JncvC" id="2xYujawbHyg" role="JncvA">
+                <property role="TrG5h" value="interact" />
+                <node concept="2jxLKc" id="2xYujawbHyh" role="1tU5fm" />
+              </node>
+              <node concept="1r4N1M" id="2xYujawe0YI" role="JncvB" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/languages/openpme.core/models/structure.mps b/languages/openpme.core/models/structure.mps
index 0b0470a6..3d062433 100644
--- a/languages/openpme.core/models/structure.mps
+++ b/languages/openpme.core/models/structure.mps
@@ -17,6 +17,7 @@
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
+        <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
@@ -1185,5 +1186,26 @@
       <ref role="20lvS9" node="5BkNMNhkShv" resolve="FieldContainer" />
     </node>
   </node>
+  <node concept="1TIwiD" id="2xYujawbBJS">
+    <property role="EcuMT" value="2917902866925386744" />
+    <property role="3GE5qa" value="simulation.expressions" />
+    <property role="TrG5h" value="ParticleDistance" />
+    <property role="R4oN_" value="distance" />
+    <ref role="1TJDcQ" to="caxt:2cc5eidBZl2" resolve="Expression" />
+    <node concept="1TJgyj" id="2xYujawbH_O" role="1TKVEi">
+      <property role="IQ2ns" value="2917902866925410676" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="self" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="5oki:2fc2f1uxV6Z" resolve="VariableReference" />
+    </node>
+    <node concept="1TJgyj" id="2xYujawbHBe" role="1TKVEi">
+      <property role="IQ2ns" value="2917902866925410766" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="neighbor" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="5oki:2fc2f1uxV6Z" resolve="VariableReference" />
+    </node>
+  </node>
 </model>
 
diff --git a/solutions/TestSolution/models/declarative2.mps b/solutions/TestSolution/models/declarative2.mps
index c3c1bcc6..a0060b14 100644
--- a/solutions/TestSolution/models/declarative2.mps
+++ b/solutions/TestSolution/models/declarative2.mps
@@ -14,6 +14,10 @@
   <imports />
   <registry>
     <language id="66673400-467e-48d2-ace0-6f708d2ef66d" name="openpme.core">
+      <concept id="2917902866925386744" name="openpme.core.structure.ParticleDistance" flags="ng" index="28k0ba">
+        <child id="2917902866925410676" name="self" index="28ka16" />
+        <child id="2917902866925410766" name="neighbor" index="28ka3W" />
+      </concept>
       <concept id="6473026355835667551" name="openpme.core.structure.FieldContainer" flags="ng" index="28xOHN">
         <child id="6473026355835667552" name="property" index="28xOHc" />
         <child id="6473026355838427228" name="size" index="28EmXK" />
@@ -42,7 +46,6 @@
       <concept id="1387474872146285163" name="openpme.core.structure.PropertyReference" flags="ng" index="2qjxXw">
         <reference id="1387474872146285164" name="property" index="2qjxXB" />
       </concept>
-      <concept id="1387474872146533755" name="openpme.core.structure.PointType" flags="ng" index="2qk_1K" />
       <concept id="1387474872142997143" name="openpme.core.structure.ParticlePositionAccess" flags="ng" index="2rB6Is">
         <child id="1387474872142997146" name="ref" index="2rB6Ih" />
       </concept>
@@ -59,7 +62,6 @@
         <child id="7548145485610591343" name="cutoffradius_value" index="2A2s8W" />
       </concept>
       <concept id="7548145485610539133" name="openpme.core.structure.Ghost" flags="ng" index="2A2bSI" />
-      <concept id="7548145485610539132" name="openpme.core.structure.InitialConditions" flags="ng" index="2A2bSJ" />
       <concept id="7548145485610582913" name="openpme.core.structure.Box" flags="ng" index="2A2uni">
         <child id="7548145485610582929" name="y1" index="2A2un2" />
         <child id="7548145485610582935" name="z1" index="2A2un4" />
@@ -160,7 +162,6 @@
         <child id="7548145485610548787" name="ghost" index="2A29xw" />
         <child id="7548145485610548769" name="domain_size" index="2A29xM" />
         <child id="7548145485610548772" name="boundary_conditions" index="2A29xR" />
-        <child id="7548145485610548776" name="initial_conditions" index="2A29xV" />
         <child id="7548145485610548781" name="cutoff_radius" index="2A29xY" />
       </concept>
       <concept id="5443610339528638132" name="openpme.modules.structure.Module" flags="ng" index="1GHexR">
@@ -206,9 +207,8 @@
         </node>
       </node>
       <node concept="2A2bSC" id="4TedDNlcill" role="2A29xR">
-        <node concept="2A2w70" id="4TedDNlcilm" role="2A2w73" />
+        <node concept="2A2w70" id="2xYujawjC7Q" role="2A2w73" />
       </node>
-      <node concept="2A2bSJ" id="4TedDNlciln" role="2A29xV" />
       <node concept="2A2bSH" id="4TedDNlcilo" role="2A29xY">
         <node concept="2$GK$c" id="4TedDNlcilp" role="2A2s8W">
           <property role="2$GK$b" value="0.3" />
@@ -345,30 +345,7 @@
             <property role="2$GK$b" value="0.0" />
           </node>
         </node>
-        <node concept="2G0pd6" id="4TedDNlcuKU" role="rpc0u">
-          <property role="TrG5h" value="r" />
-          <node concept="2qk_1K" id="57hfxDv$l1P" role="1wvloH" />
-        </node>
         <node concept="eFf55" id="57hfxDvwTI1" role="rpc0u">
-          <node concept="1wvtVb" id="57hfxDvzkCV" role="eFLQ2">
-            <node concept="2$G188" id="57hfxDvzkDi" role="1wvtVa">
-              <node concept="1XiV_f" id="57hfxDvzkDj" role="2$G181">
-                <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
-              </node>
-              <node concept="37xRux" id="57hfxDvzkDk" role="2$G18d">
-                <node concept="2rB6Is" id="57hfxDvzkDl" role="2$G181">
-                  <node concept="1XiV_f" id="57hfxDvzkF3" role="2rB6Ih">
-                    <ref role="1Xh6_M" node="57hfxDvymUK" resolve="p" />
-                  </node>
-                </node>
-                <node concept="2rB6Is" id="57hfxDvzkDn" role="2$G18d">
-                  <node concept="1XiV_f" id="57hfxDvzkG8" role="2rB6Ih">
-                    <ref role="1Xh6_M" node="57hfxDvxS_0" resolve="q" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="1XiV_f" id="57hfxDvwTRA" role="eFeEu">
             <ref role="1Xh6_M" node="4TedDNlcilt" resolve="particles" />
           </node>
@@ -401,9 +378,14 @@
                         <node concept="2$GKAY" id="57hfxDvzkKz" role="2$G18d">
                           <property role="2$GKAX" value="7" />
                         </node>
-                        <node concept="2q6huI" id="57hfxDvzkK$" role="2$G181">
-                          <node concept="1XiV_f" id="57hfxDvzkK_" role="2q6huW">
-                            <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
+                        <node concept="2q6huI" id="2xYujawiZhF" role="2$G181">
+                          <node concept="28k0ba" id="2xYujawiZii" role="2q6huW">
+                            <node concept="1XiV_f" id="2xYujawiZik" role="28ka16">
+                              <ref role="1Xh6_M" node="57hfxDvymUK" resolve="p" />
+                            </node>
+                            <node concept="1XiV_f" id="2xYujawiZil" role="28ka3W">
+                              <ref role="1Xh6_M" node="57hfxDvxS_0" resolve="q" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -416,17 +398,27 @@
                         <node concept="2$GKAY" id="57hfxDvzkKD" role="2$G18d">
                           <property role="2$GKAX" value="4" />
                         </node>
-                        <node concept="2q6huI" id="57hfxDvzkKE" role="2$G181">
-                          <node concept="1XiV_f" id="57hfxDvzkKF" role="2q6huW">
-                            <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
+                        <node concept="2q6huI" id="2xYujawiZf8" role="2$G181">
+                          <node concept="28k0ba" id="2xYujawiZf$" role="2q6huW">
+                            <node concept="1XiV_f" id="2xYujawiZfA" role="28ka16">
+                              <ref role="1Xh6_M" node="57hfxDvymUK" resolve="p" />
+                            </node>
+                            <node concept="1XiV_f" id="2xYujawiZfB" role="28ka3W">
+                              <ref role="1Xh6_M" node="57hfxDvxS_0" resolve="q" />
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1XiV_f" id="57hfxDvzkKG" role="2$G18d">
-                  <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
+                <node concept="28k0ba" id="2xYujawiZde" role="2$G18d">
+                  <node concept="1XiV_f" id="2xYujawiZdg" role="28ka16">
+                    <ref role="1Xh6_M" node="57hfxDvymUK" resolve="p" />
+                  </node>
+                  <node concept="1XiV_f" id="2xYujawiZdh" role="28ka3W">
+                    <ref role="1Xh6_M" node="57hfxDvxS_0" resolve="q" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -527,25 +519,6 @@
             <node concept="1XiV_f" id="57hfxDv$hOZ" role="eFeEu">
               <ref role="1Xh6_M" node="4TedDNlcilt" resolve="particles" />
             </node>
-            <node concept="1wvtVb" id="57hfxDv$hRs" role="eFLQ2">
-              <node concept="2$G188" id="57hfxDv$hVI" role="1wvtVa">
-                <node concept="1XiV_f" id="57hfxDv$hVJ" role="2$G181">
-                  <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
-                </node>
-                <node concept="37xRux" id="57hfxDv$hVK" role="2$G18d">
-                  <node concept="2rB6Is" id="57hfxDv$hVL" role="2$G181">
-                    <node concept="1XiV_f" id="57hfxDv$i1l" role="2rB6Ih">
-                      <ref role="1Xh6_M" node="57hfxDv$hKC" resolve="p_i" />
-                    </node>
-                  </node>
-                  <node concept="2rB6Is" id="57hfxDv$hVN" role="2$G18d">
-                    <node concept="1XiV_f" id="57hfxDv$i2q" role="2rB6Ih">
-                      <ref role="1Xh6_M" node="57hfxDv$hKy" resolve="q_i" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="1wvtVb" id="57hfxDv$hY2" role="eFLQ2">
               <node concept="o2qFD" id="57hfxDv$hY3" role="1wvtVa">
                 <node concept="SDg2Y" id="57hfxDv$hY4" role="2$G181">
@@ -575,9 +548,14 @@
                           <node concept="2$GKAY" id="57hfxDv$hYg" role="2$G18d">
                             <property role="2$GKAX" value="7" />
                           </node>
-                          <node concept="2q6huI" id="57hfxDv$hYh" role="2$G181">
-                            <node concept="1XiV_f" id="57hfxDv$hYi" role="2q6huW">
-                              <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
+                          <node concept="2q6huI" id="2xYujawiZ9e" role="2$G181">
+                            <node concept="28k0ba" id="2xYujawiZ9E" role="2q6huW">
+                              <node concept="1XiV_f" id="2xYujawiZ9G" role="28ka16">
+                                <ref role="1Xh6_M" node="57hfxDv$hKC" resolve="p_i" />
+                              </node>
+                              <node concept="1XiV_f" id="2xYujawiZ9H" role="28ka3W">
+                                <ref role="1Xh6_M" node="57hfxDv$hKy" resolve="q_i" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -590,17 +568,27 @@
                           <node concept="2$GKAY" id="57hfxDv$hYm" role="2$G18d">
                             <property role="2$GKAX" value="4" />
                           </node>
-                          <node concept="2q6huI" id="57hfxDv$hYn" role="2$G181">
-                            <node concept="1XiV_f" id="57hfxDv$hYo" role="2q6huW">
-                              <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
+                          <node concept="2q6huI" id="2xYujawiZ58" role="2$G181">
+                            <node concept="28k0ba" id="2xYujawiZ5J" role="2q6huW">
+                              <node concept="1XiV_f" id="2xYujawiZ5L" role="28ka16">
+                                <ref role="1Xh6_M" node="57hfxDv$hKC" resolve="p_i" />
+                              </node>
+                              <node concept="1XiV_f" id="2xYujawiZ5M" role="28ka3W">
+                                <ref role="1Xh6_M" node="57hfxDv$hKy" resolve="q_i" />
+                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="1XiV_f" id="57hfxDv$hYp" role="2$G18d">
-                    <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
+                  <node concept="28k0ba" id="2xYujawiZ3$" role="2$G18d">
+                    <node concept="1XiV_f" id="2xYujawiZ3A" role="28ka16">
+                      <ref role="1Xh6_M" node="57hfxDv$hKC" resolve="p_i" />
+                    </node>
+                    <node concept="1XiV_f" id="2xYujawiZ3B" role="28ka3W">
+                      <ref role="1Xh6_M" node="57hfxDv$hKy" resolve="q_i" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -654,25 +642,6 @@
             <node concept="1XiV_f" id="57hfxDv$iLZ" role="eFeEu">
               <ref role="1Xh6_M" node="4TedDNlcilt" resolve="particles" />
             </node>
-            <node concept="1wvtVb" id="57hfxDv$iOS" role="eFLQ2">
-              <node concept="2$G188" id="57hfxDv$iOT" role="1wvtVa">
-                <node concept="1XiV_f" id="57hfxDv$iOU" role="2$G181">
-                  <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
-                </node>
-                <node concept="37xRux" id="57hfxDv$iOV" role="2$G18d">
-                  <node concept="2rB6Is" id="57hfxDv$iOW" role="2$G181">
-                    <node concept="1XiV_f" id="57hfxDv$iPl" role="2rB6Ih">
-                      <ref role="1Xh6_M" node="57hfxDv$iJ4" resolve="p_i2" />
-                    </node>
-                  </node>
-                  <node concept="2rB6Is" id="57hfxDv$iOY" role="2$G18d">
-                    <node concept="1XiV_f" id="57hfxDv$iPI" role="2rB6Ih">
-                      <ref role="1Xh6_M" node="57hfxDv$iIY" resolve="q_i2" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="1wvtVb" id="57hfxDv$iR9" role="eFLQ2">
               <node concept="o2qFD" id="57hfxDv$iRa" role="1wvtVa">
                 <node concept="37xRux" id="57hfxDv$iRc" role="2$G18d">
@@ -689,8 +658,13 @@
                           <node concept="2$GKAY" id="57hfxDv$iRj" role="2$G18d">
                             <property role="2$GKAX" value="6" />
                           </node>
-                          <node concept="1XiV_f" id="57hfxDv$iRk" role="2$G181">
-                            <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
+                          <node concept="28k0ba" id="2xYujawiZlb" role="2$G181">
+                            <node concept="1XiV_f" id="2xYujawiZld" role="28ka16">
+                              <ref role="1Xh6_M" node="57hfxDv$iJ4" resolve="p_i2" />
+                            </node>
+                            <node concept="1XiV_f" id="2xYujawiZle" role="28ka3W">
+                              <ref role="1Xh6_M" node="57hfxDv$iIY" resolve="q_i2" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -699,12 +673,17 @@
                           <ref role="1Xh6_M" node="4TedDNlcilG" resolve="sigma6" />
                         </node>
                         <node concept="2q8Tgh" id="57hfxDv$iRn" role="2$G18d">
-                          <node concept="1XiV_f" id="57hfxDv$iRo" role="2$G181">
-                            <ref role="1Xh6_M" node="4TedDNlcuKU" resolve="r" />
-                          </node>
                           <node concept="2$GKAY" id="57hfxDv$iRp" role="2$G18d">
                             <property role="2$GKAX" value="3" />
                           </node>
+                          <node concept="28k0ba" id="2xYujawiZmm" role="2$G181">
+                            <node concept="1XiV_f" id="2xYujawiZmo" role="28ka16">
+                              <ref role="1Xh6_M" node="57hfxDv$iJ4" resolve="p_i2" />
+                            </node>
+                            <node concept="1XiV_f" id="2xYujawiZmp" role="28ka3W">
+                              <ref role="1Xh6_M" node="57hfxDv$iIY" resolve="q_i2" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
diff --git a/solutions/TestSolution/models/particle_optimized.mps b/solutions/TestSolution/models/particle_optimized.mps
index e8e8ae95..24c6b9e9 100644
--- a/solutions/TestSolution/models/particle_optimized.mps
+++ b/solutions/TestSolution/models/particle_optimized.mps
@@ -66,7 +66,6 @@
         <child id="7548145485610591343" name="cutoffradius_value" index="2A2s8W" />
       </concept>
       <concept id="7548145485610539133" name="openpme.core.structure.Ghost" flags="ng" index="2A2bSI" />
-      <concept id="7548145485610539132" name="openpme.core.structure.InitialConditions" flags="ng" index="2A2bSJ" />
       <concept id="7548145485610582913" name="openpme.core.structure.Box" flags="ng" index="2A2uni">
         <child id="7548145485610582929" name="y1" index="2A2un2" />
         <child id="7548145485610582935" name="z1" index="2A2un4" />
@@ -170,7 +169,6 @@
         <child id="7548145485610548787" name="ghost" index="2A29xw" />
         <child id="7548145485610548769" name="domain_size" index="2A29xM" />
         <child id="7548145485610548772" name="boundary_conditions" index="2A29xR" />
-        <child id="7548145485610548776" name="initial_conditions" index="2A29xV" />
         <child id="7548145485610548781" name="cutoff_radius" index="2A29xY" />
         <child id="2071243749762182961" name="num_particles" index="1Rr2o6" />
       </concept>
@@ -217,9 +215,8 @@
         </node>
       </node>
       <node concept="2A2bSC" id="7bpBJvmqTaI" role="2A29xR">
-        <node concept="2A2w70" id="1Uhwoc5TFC2" role="2A2w73" />
+        <node concept="2A2w70" id="2xYujawjC4P" role="2A2w73" />
       </node>
-      <node concept="2A2bSJ" id="7bpBJvmqTaJ" role="2A29xV" />
       <node concept="2A2bSH" id="7bpBJvmqTaK" role="2A29xY">
         <node concept="2$GK$c" id="1Uhwoc5WV$f" role="2A2s8W">
           <property role="2$GK$b" value="0.3" />