[FIXED]#132 - anagram sample

ELENA-LANG · Nov 10, 2023 · ab75120 · bencz · Nov 14, 2023 · arakov
1 parent 08ad647
commit ab75120
Show file tree

Hide file tree

Showing 7 changed files with 175 additions and 1 deletion.
diff --git a/doc/api/system-routines.html b/doc/api/system-routines.html
@@ -252,6 +252,15 @@ <H3>Method Summary</H3>
 <CODE>
 </CODE></TD>
 <TD CLASS="colLast">
+<CODE>setAt(<SPAN CLASS="memberNameLink"><A HREF="system.html#IntNumber">IntNumber</A></SPAN> index, <SPAN CLASS="memberNameLink"><A HREF="system.html#Object">Object</A></SPAN> value)
+</CODE>
+</TD>
+</TR>
+<TR CLASS="altColor">
+<TD CLASS="colFirst">
+<CODE>
+</CODE></TD>
+<TD CLASS="colLast">
 <CODE>exchange(<SPAN CLASS="memberNameLink"><A HREF="system.html#IntNumber">IntNumber</A></SPAN> i, <SPAN CLASS="memberNameLink"><A HREF="system.html#IntNumber">IntNumber</A></SPAN> j)
 </CODE>
 </TD>
@@ -817,6 +826,15 @@ <H3>Method Summary</H3>
 <CODE>
 </CODE></TD>
 <TD CLASS="colLast">
+<CODE>setAt(<SPAN CLASS="memberNameLink"><A HREF="system.html#IntNumber">IntNumber</A></SPAN> index, <SPAN CLASS="memberNameLink"><A HREF="system.html#Object">Object</A></SPAN> value)
+</CODE>
+</TD>
+</TR>
+<TR CLASS="altColor">
+<TD CLASS="colFirst">
+<CODE>
+</CODE></TD>
+<TD CLASS="colLast">
 <CODE>exchange(<SPAN CLASS="memberNameLink"><A HREF="system.html#IntNumber">IntNumber</A></SPAN> i, <SPAN CLASS="memberNameLink"><A HREF="system.html#IntNumber">IntNumber</A></SPAN> j)
 </CODE>
 </TD>
@@ -1602,6 +1620,15 @@ <H3>Method Summary</H3>
 <CODE>
 <i>abstract </i>&nbsp;</CODE></TD>
 <TD CLASS="colLast">
+<CODE>setAt(<SPAN CLASS="memberNameLink"><A HREF="system.html#IntNumber">IntNumber</A></SPAN> index, <SPAN CLASS="memberNameLink"><A HREF="system.html#Object">Object</A></SPAN> value)
+</CODE>
+</TD>
+</TR>
+<TR CLASS="altColor">
+<TD CLASS="colFirst">
+<CODE>
+<i>abstract </i>&nbsp;</CODE></TD>
+<TD CLASS="colLast">
 <CODE>exchange(<SPAN CLASS="memberNameLink"><A HREF="system.html#IntNumber">IntNumber</A></SPAN> i, <SPAN CLASS="memberNameLink"><A HREF="system.html#IntNumber">IntNumber</A></SPAN> j)
 </CODE>
 </TD>

diff --git a/rebuild_lib60.bat b/rebuild_lib60.bat
@@ -72,6 +72,11 @@ bin\elena-cli src60\cellular\cellular.prj
 if %ERRORLEVEL% EQU -2 GOTO CompilerError
 @echo on
 
+bin\elena-cli src60\algorithms\algorithms.prj
+@echo off 
+if %ERRORLEVEL% EQU -2 GOTO CompilerError
+@echo on
+
 bin\elena-cli src60\forms\forms.prj
 @echo off 
 if %ERRORLEVEL% EQU -2 GOTO CompilerError

diff --git a/src60/algorithms/algorithms.prj b/src60/algorithms/algorithms.prj
@@ -0,0 +1,27 @@
+<configuration>
+  <platform key="Win_x86">
+     <project>
+        <output>..\..\lib60</output>
+     </project>
+  </platform>
+  <platform key="Win_x64">
+     <project>
+        <output>..\..\lib60_64</output>
+     </project>
+  </platform>
+  <project>
+     <namespace>algorithms</namespace>
+     <template>lib60</template>
+  </project>
+  <manifest>
+     <name>ELENA Algorithms Library</name>
+     <version>6.0.0</version>
+     <author>Aleksey Rakov</author>
+  </manifest>
+  <files>
+     <module>
+        <include>quicksort.l</include>
+        <include>sort_extensions.l</include>
+     </module>
+  </files>
+</configuration>
diff --git a/src60/algorithms/quicksort.l b/src60/algorithms/quicksort.l
@@ -0,0 +1,61 @@
+import system'routines;
+import system'collections;
+
+const int MAX_LEVELS = 64;
+
+public singleton QuickSortAlgorithm
+{
+   sort(SortingAgent source, int start, int length, Func2 compf)
+   {
+      int beg[MAX_LEVELS];
+      int end[MAX_LEVELS];
+
+      beg[0] := start;
+      end[0] := length;
+
+      int i := 0;
+      while (i >= 0) {
+         int L := beg[i];
+         int R := end[i];
+         if (R > L + 1) {
+            R--;
+
+            var piv := source[L];
+            while (L < R) {
+               while ((!compf(source[R], piv)) && L < R)
+                  R--;
+
+               if (L < R) {
+                  source[L] := source[R];
+                  L++;                  
+               };
+
+               while (compf(source[L], piv) && L < R)
+                  L++;
+
+               if (L < R) {
+                  source[R] := source[L];
+                  R--;                  
+               }                  
+            };
+            source[L] := piv;
+            if (L - beg[i] > end[i] - R) {
+               beg[i + 1] := L + 1;
+               end[i + 1] := end[i];
+               end[i] := L;
+               i++;
+            }
+            else {
+               beg[i + 1] := beg[i];
+               end[i + 1] := L;
+               beg[i] := L + 1;
+               i++;
+            };            
+         }         
+         else 
+         {
+            i--;
+         }
+      }
+   }
+}
diff --git a/src60/algorithms/sort_extensions.l b/src60/algorithms/sort_extensions.l
@@ -0,0 +1,39 @@
+import system'collections;
+import system'routines;
+
+public extension quickSortOp : Indexable
+{
+   quickSort(int length, Func2 compf)
+   {
+      QuickSortAlgorithm.sort(new IndexerSortingAgent(self), 0, length, compf);
+   }
+
+   quickSort(int length)
+      = self.quickSort(length, ifOrdered);
+}
+
+public extension quickSortOp2 : ArrayList
+{
+   quickSort(Func2 compf)
+   {
+      QuickSortAlgorithm.sort(new IndexerSortingAgent(self), 0, self.Length, compf);
+   }
+
+   quickSort()
+   {
+      QuickSortAlgorithm.sort(new IndexerSortingAgent(self), 0, self.Length, ifOrdered);
+   }
+}
+
+public extension quickSortOp3
+{
+   quickSort(Func2 compf)
+   {
+      QuickSortAlgorithm.sort(new IndexerSortingAgent(self), 0, self.Length, compf);
+   }
+
+   quickSort()
+   {
+      QuickSortAlgorithm.sort(new IndexerSortingAgent(self), 0, self.Length, ifOrdered);
+   }
+}
diff --git a/src60/system/routines/sorting.l b/src60/system/routines/sorting.l
@@ -8,6 +8,8 @@ public interface SortingAgent
    }    
 
    abstract at(int index);
+
+   abstract setAt(int index, object value);
 
    abstract exchange(int i, int j);
 }
@@ -34,6 +36,11 @@ public sealed ArraySortingAgent : SortingAgent
    at(int index)
       = a[index];
 
+   setAt(int index, object value)
+   {
+      a[index] := value;
+   }
+
    exchange(int i, int j)
    {
       var tmp := a[i];
@@ -71,6 +78,13 @@ public sealed IndexerSortingAgent : SortingAgent
 
       ^ *a
    }
+
+   setAt(int index, object value)
+   {
+      a.Index := index;
+
+      a.Value := value
+   }
 
    exchange(int i, int j)
    {

diff --git a/tests60/sandbox/sandbox.l b/tests60/sandbox/sandbox.l
@@ -5,6 +5,7 @@ import system'collections;
 import extensions;
 import extensions'routines;
 import extensions'text;
+import algorithms;
 
 extension op
 {
@@ -32,7 +33,7 @@ public program()
     };
 
     dictionary.Values
-        .sort:(former,later => former.Item2.Length > later.Item2.Length )
+        .quickSort:(former,later => former.Item2.Length > later.Item2.Length )
         .top:20
         .forEach:(pair){ console.printLine(pair.Item2) };