diff options
Diffstat (limited to 'linearkombination.inc')
-rw-r--r-- | linearkombination.inc | 96 |
1 files changed, 72 insertions, 24 deletions
diff --git a/linearkombination.inc b/linearkombination.inc index 2d6a27d..0f6ceca 100644 --- a/linearkombination.inc +++ b/linearkombination.inc @@ -15,9 +15,14 @@ procedure tWertePunkt.liKo(in1,in2 {$IFDEF lkA14},in13,in14 {$IFDEF lkA15},in15 {$IFDEF lkA16},in16 -{$IFDEF lkA22},in17,in18,in19,in20,in21,in22 +{$IFDEF lkA17},in17 +{$IFDEF lkA18},in18 +{$IFDEF lkA19},in19 +{$IFDEF lkA22},in20,in21,in22 {$IFDEF lkA23},in23 -{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: tWertePunkt; +{$IFDEF lkA31},in24,in25,in26,in27,in28,in29,in30,in31 +{$IFDEF lkA32},in32 +{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: tWertePunkt; fak2 {$IFDEF lkA3},fak3 {$IFDEF lkA4},fak4 @@ -32,9 +37,14 @@ fak2 {$IFDEF lkA14},fak13,fak14 {$IFDEF lkA15},fak15 {$IFDEF lkA16},fak16 -{$IFDEF lkA22},fak17,fak18,fak19,fak20,fak21,fak22 +{$IFDEF lkA17},fak17 +{$IFDEF lkA18},fak18 +{$IFDEF lkA19},fak19 +{$IFDEF lkA22},fak20,fak21,fak22 {$IFDEF lkA23},fak23 -{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: extended); +{$IFDEF lkA31},fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31 +{$IFDEF lkA32},fak32 +{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: extended); var emF: tEMFeldInhalt; maF: tMaterieFeldInhalt; @@ -62,15 +72,24 @@ begin + fak13 * in13.emWerte[emF,true] + fak14 * in14.emWerte[emF,true] {$IFDEF lkA15} + fak15 * in15.emWerte[emF,true] {$IFDEF lkA16} - + fak16 * in16.emWerte[emF,true] {$IFDEF lkA22} - + fak17 * in17.emWerte[emF,true] - + fak18 * in18.emWerte[emF,true] - + fak19 * in19.emWerte[emF,true] + + fak16 * in16.emWerte[emF,true] {$IFDEF lkA17} + + fak17 * in17.emWerte[emF,true] {$IFDEF lkA18} + + fak18 * in18.emWerte[emF,true] {$IFDEF lkA19} + + fak19 * in19.emWerte[emF,true] {$IFDEF lkA22} + fak20 * in20.emWerte[emF,true] + fak21 * in21.emWerte[emF,true] + fak22 * in22.emWerte[emF,true] {$IFDEF lkA23} - + fak23 * in23.emWerte[emF,true] - {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}; + + fak23 * in23.emWerte[emF,true] {$IFDEF lkA31} + + fak24 * in24.emWerte[emF,true] + + fak25 * in25.emWerte[emF,true] + + fak26 * in26.emWerte[emF,true] + + fak27 * in27.emWerte[emF,true] + + fak28 * in28.emWerte[emF,true] + + fak29 * in29.emWerte[emF,true] + + fak30 * in30.emWerte[emF,true] + + fak31 * in31.emWerte[emF,true] {$IFDEF lkA32} + + fak32 * in32.emWerte[emF,true] + {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}; (* tMaterieFeldInhalt = ( mfN,mfDPsiDX, @@ -95,15 +114,24 @@ begin + fak13 * in13.matWerte[i,maF,true] + fak14 * in14.matWerte[i,maF,true] {$IFDEF lkA15} + fak15 * in15.matWerte[i,maF,true] {$IFDEF lkA16} - + fak16 * in16.matWerte[i,maF,true] {$IFDEF lkA22} - + fak17 * in17.matWerte[i,maF,true] - + fak18 * in18.matWerte[i,maF,true] - + fak19 * in19.matWerte[i,maF,true] + + fak16 * in16.matWerte[i,maF,true] {$IFDEF lkA17} + + fak17 * in17.matWerte[i,maF,true] {$IFDEF lkA18} + + fak18 * in18.matWerte[i,maF,true] {$IFDEF lkA19} + + fak19 * in19.matWerte[i,maF,true] {$IFDEF lkA22} + fak20 * in20.matWerte[i,maF,true] + fak21 * in21.matWerte[i,maF,true] + fak22 * in22.matWerte[i,maF,true] {$IFDEF lkA23} - + fak23 * in23.matWerte[i,maF,true] - {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}; + + fak23 * in23.matWerte[i,maF,true] {$IFDEF lkA31} + + fak24 * in24.matWerte[i,maF,true] + + fak25 * in25.matWerte[i,maF,true] + + fak26 * in26.matWerte[i,maF,true] + + fak27 * in27.matWerte[i,maF,true] + + fak28 * in28.matWerte[i,maF,true] + + fak29 * in29.matWerte[i,maF,true] + + fak30 * in30.matWerte[i,maF,true] + + fak31 * in31.matWerte[i,maF,true] {$IFDEF lkA32} + + fak32 * in32.matWerte[i,maF,true] + {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}; end; // Werte werden auf (in1 + \sum_i faki * ini') gesetzt @@ -122,9 +150,14 @@ procedure tFelder.liKo(in1,in2 {$IFDEF lkA14},in13,in14 {$IFDEF lkA15},in15 {$IFDEF lkA16},in16 -{$IFDEF lkA22},in17,in18,in19,in20,in21,in22 +{$IFDEF lkA17},in17 +{$IFDEF lkA18},in18 +{$IFDEF lkA19},in19 +{$IFDEF lkA22},in20,in21,in22 {$IFDEF lkA23},in23 -{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: tFelder; +{$IFDEF lkA31},in24,in25,in26,in27,in28,in29,in30,in31 +{$IFDEF lkA32},in32 +{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: tFelder; fak2 {$IFDEF lkA3},fak3 {$IFDEF lkA4},fak4 @@ -139,9 +172,14 @@ fak2 {$IFDEF lkA14},fak13,fak14 {$IFDEF lkA15},fak15 {$IFDEF lkA16},fak16 -{$IFDEF lkA22},fak17,fak18,fak19,fak20,fak21,fak22 +{$IFDEF lkA17},fak17 +{$IFDEF lkA18},fak18 +{$IFDEF lkA19},fak19 +{$IFDEF lkA22},fak20,fak21,fak22 {$IFDEF lkA23},fak23 -{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: extended); +{$IFDEF lkA31},fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31 +{$IFDEF lkA32},fak32 +{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: extended); var i: longint; begin @@ -161,9 +199,14 @@ begin {$IFDEF lkA14},in13.inhalt[i],in14.inhalt[i] {$IFDEF lkA15},in15.inhalt[i] {$IFDEF lkA16},in16.inhalt[i] - {$IFDEF lkA22},in17.inhalt[i],in18.inhalt[i],in19.inhalt[i],in20.inhalt[i],in21.inhalt[i],in22.inhalt[i] + {$IFDEF lkA17},in17.inhalt[i] + {$IFDEF lkA18},in18.inhalt[i] + {$IFDEF lkA19},in19.inhalt[i] + {$IFDEF lkA22},in20.inhalt[i],in21.inhalt[i],in22.inhalt[i] {$IFDEF lkA23},in23.inhalt[i] - {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}, + {$IFDEF lkA31},in24.inhalt[i],in25.inhalt[i],in26.inhalt[i],in27.inhalt[i],in28.inhalt[i],in29.inhalt[i],in30.inhalt[i],in31.inhalt[i] + {$IFDEF lkA32},in32.inhalt[i] + {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}, fak2 {$IFDEF lkA3},fak3 {$IFDEF lkA4},fak4 @@ -178,9 +221,14 @@ begin {$IFDEF lkA14},fak13,fak14 {$IFDEF lkA15},fak15 {$IFDEF lkA16},fak16 - {$IFDEF lkA22},fak17,fak18,fak19,fak20,fak21,fak22 + {$IFDEF lkA17},fak17 + {$IFDEF lkA18},fak18 + {$IFDEF lkA19},fak19 + {$IFDEF lkA22},fak20,fak21,fak22 {$IFDEF lkA23},fak23 - {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}); + {$IFDEF lkA31},fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31 + {$IFDEF lkA32},fak32 + {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}); end; |