an neue units angepasst

5 files changed, 57 insertions, 114 deletions

diff --git a/ROM.lpi b/ROM.lpi
index d57d7be..038838a 100644
--- a/ROM.lpi
+++ b/ROM.lpi
@@ -34,7 +34,6 @@
       <Unit0>
         <Filename Value="ROM.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ROM"/>
       </Unit0>
       <Unit1>
         <Filename Value="romunit.pas"/>
@@ -55,6 +54,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
+      <OtherUnitFiles Value="../units"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
@@ -73,12 +73,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerMessages>
-        <MsgFileName Value=""/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="3">
diff --git a/ROM.lpr b/ROM.lpr
index 38ae920..f7ca02c 100644
--- a/ROM.lpr
+++ b/ROM.lpr
@@ -10,7 +10,7 @@ uses
   {$ENDIF}{$ENDIF}
   Classes
   { you can add units after this },
-  SysUtils,ROMunit, mathunit, Math;
+  SysUtils,ROMunit, matheunit, Math;
 
 var inPulsO,inPuls,refPulsO,refPuls,surTraj,cRefPuls:      tExtPointArray;
     smooth,betaSmooth:                                     longint;
diff --git a/ROM.lps b/ROM.lps
index d5de911..9211447 100644
--- a/ROM.lps
+++ b/ROM.lps
@@ -3,16 +3,12 @@
   <ProjectSession>
     <Version Value="9"/>
     <BuildModes Active="Default"/>
-    <Units Count="3">
+    <Units Count="4">
       <Unit0>
         <Filename Value="ROM.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ROM"/>
         <IsVisibleTab Value="True"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="174"/>
-        <CursorPos X="10" Y="204"/>
+        <CursorPos X="26" Y="13"/>
         <UsageCount Value="94"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -21,9 +17,7 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="romunit"/>
         <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="37"/>
-        <CursorPos X="13" Y="62"/>
+        <CursorPos X="33" Y="8"/>
         <FoldState Value=" T3iD041 pkRkZ0Y2]9clZ093 piXj70G]Rj3jN0w6]9UlG0S[I4Ck10P7]aejg]+l"/>
         <UsageCount Value="94"/>
         <Loaded Value="True"/>
@@ -32,139 +26,140 @@
         <Filename Value="mathunit.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="mathunit"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="4"/>
-        <CursorPos X="1" Y="43"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos Y="10"/>
         <UsageCount Value="93"/>
-        <Loaded Value="True"/>
       </Unit2>
+      <Unit3>
+        <Filename Value="../units/matheunit.pas"/>
+        <UnitName Value="matheunit"/>
+        <EditorIndex Value="2"/>
+        <CursorPos Y="19"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit3>
     </Units>
-    <General>
-      <ActiveWindowIndexAtStart Value="0"/>
-    </General>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="romunit.pas"/>
-        <Caret Line="987" Column="11" TopLine="947"/>
+        <Caret Line="992" Column="42" TopLine="947"/>
       </Position1>
       <Position2>
         <Filename Value="romunit.pas"/>
-        <Caret Line="32" Column="33" TopLine="22"/>
+        <Caret Line="1003" Column="53" TopLine="973"/>
       </Position2>
       <Position3>
         <Filename Value="romunit.pas"/>
-        <Caret Line="992" Column="42" TopLine="947"/>
+        <Caret Line="1001" Column="79" TopLine="719"/>
       </Position3>
       <Position4>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="1003" Column="53" TopLine="973"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="20" Column="55" TopLine="10"/>
       </Position4>
       <Position5>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="1001" Column="79" TopLine="719"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="24" Column="52" TopLine="5"/>
       </Position5>
       <Position6>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="20" Column="55" TopLine="10"/>
+        <Caret Line="20" Column="24" TopLine="12"/>
       </Position6>
       <Position7>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="24" Column="52" TopLine="5"/>
+        <Caret Line="38" Column="14" TopLine="24"/>
       </Position7>
       <Position8>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="20" Column="24" TopLine="12"/>
+        <Caret Line="163" Column="40" TopLine="121"/>
       </Position8>
       <Position9>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="38" Column="14" TopLine="24"/>
+        <Caret Line="206" TopLine="191"/>
       </Position9>
       <Position10>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="163" Column="40" TopLine="121"/>
+        <Caret Line="20" Column="56"/>
       </Position10>
       <Position11>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="206" Column="1" TopLine="191"/>
+        <Caret Line="196" Column="45" TopLine="175"/>
       </Position11>
       <Position12>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="20" Column="56" TopLine="1"/>
+        <Caret Line="199" Column="15" TopLine="178"/>
       </Position12>
       <Position13>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="196" Column="45" TopLine="175"/>
+        <Caret Line="201" Column="15" TopLine="180"/>
       </Position13>
       <Position14>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="199" Column="15" TopLine="178"/>
+        <Caret Line="203" Column="34" TopLine="182"/>
       </Position14>
       <Position15>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="201" Column="15" TopLine="180"/>
+        <Caret Line="208" Column="18" TopLine="187"/>
       </Position15>
       <Position16>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="203" Column="34" TopLine="182"/>
+        <Caret Line="157" Column="45" TopLine="127"/>
       </Position16>
       <Position17>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="208" Column="18" TopLine="187"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="1005" Column="6" TopLine="816"/>
       </Position17>
       <Position18>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="157" Column="45" TopLine="127"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="990" TopLine="974"/>
       </Position18>
       <Position19>
         <Filename Value="romunit.pas"/>
-        <Caret Line="1005" Column="6" TopLine="816"/>
+        <Caret Line="994" Column="45" TopLine="973"/>
       </Position19>
       <Position20>
         <Filename Value="romunit.pas"/>
-        <Caret Line="990" Column="1" TopLine="974"/>
+        <Caret Line="1003" Column="86" TopLine="974"/>
       </Position20>
       <Position21>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="994" Column="45" TopLine="973"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="208" TopLine="204"/>
       </Position21>
       <Position22>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="1003" Column="86" TopLine="974"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="207" Column="47" TopLine="186"/>
       </Position22>
       <Position23>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="208" Column="1" TopLine="204"/>
+        <Caret Line="70" Column="7" TopLine="28"/>
       </Position23>
       <Position24>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="207" Column="47" TopLine="186"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="987" Column="101" TopLine="520"/>
       </Position24>
       <Position25>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="70" Column="7" TopLine="28"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="1028" Column="50" TopLine="521"/>
       </Position25>
       <Position26>
         <Filename Value="romunit.pas"/>
-        <Caret Line="987" Column="101" TopLine="520"/>
+        <Caret Line="1024" Column="23" TopLine="759"/>
       </Position26>
       <Position27>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="1028" Column="50" TopLine="521"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="63" Column="18" TopLine="25"/>
       </Position27>
       <Position28>
         <Filename Value="romunit.pas"/>
-        <Caret Line="1024" Column="23" TopLine="759"/>
+        <Caret Line="202" Column="50" TopLine="183"/>
       </Position28>
       <Position29>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="63" Column="18" TopLine="25"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="48" Column="32" TopLine="37"/>
       </Position29>
       <Position30>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="202" Column="50" TopLine="183"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="204" Column="10" TopLine="174"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
-  <EditorMacros Count="0"/>
 </CONFIG>
diff --git a/mathunit.pas b/mathunit.pas
deleted file mode 100644
index 3d5e111..0000000
--- a/mathunit.pas
+++ /dev/null
@@ -1,46 +0,0 @@
-unit mathunit;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  Classes, SysUtils;
-
-type
-  tExtPoint = record
-    x,y: extended;
-  end;
-  tExtPointArray = array of tExtPoint;
-  pTExtPointArray = ^tExtPointArray;
-  tLongintArray = array of longint;
-  pTLongintArray = ^tLongintArray;
-  tExtendedArray = array of extended;
-
-function Plus(a,b: tExtPoint): tExtPoint;
-function Durch(a: tExtPoint; b: extended): tExtPoint;
-function myFrac(x: extended): extended;
-
-implementation
-
-function Plus(a,b: tExtPoint): tExtPoint;
-begin
-  result.x:=a.x+b.x;
-  result.y:=a.y+b.y;
-end;
-
-function Durch(a: tExtPoint; b: extended): tExtPoint;
-begin
-  result.x:=a.x/b;
-  result.y:=a.y/b;
-end;
-
-function myFrac(x: extended): extended;
-begin
-  result:=frac(x);
-  while result<0 do
-    result:=result+1;
-end;
-
-end.
-
diff --git a/romunit.pas b/romunit.pas
index 132b1cb..8bce286 100644
--- a/romunit.pas
+++ b/romunit.pas
@@ -5,7 +5,7 @@ unit romunit;
 interface
 
 uses
-  Classes, SysUtils, Math, mathunit;
+  Classes, SysUtils, Math, matheunit;
 
 procedure Fehler(s: string);
 procedure readRawInputs(nam: string; out d1,d2: tExtPointArray; var absShift: extended);