Moved sources to main

tkohout · Dec 15, 2015 · d8b4c86 · d8b4c86
1 parent 3c3c195
commit d8b4c86
Show file tree

Hide file tree

Showing 218 changed files with 182 additions and 394 deletions.
diff --git a/osrc/Expressions.cyp → examples/Expressions/Expressions.cyp b/osrc/Expressions.cyp → examples/Expressions/Expressions.cyp
@@ -4,7 +4,7 @@ tryda Ostrava {
     toz number foo pyco
     toz C boo pyco
 
-    fraj rynek(number arg1, string arg2, D arg3){
+    rynek(){
 
         toz number i, j pyco
 
@@ -26,9 +26,6 @@ tryda Ostrava {
         davaj pyco
     }
 
-    number dalsi(){
-        toz number takhle pyco
-    }
 }
 
 fajront pyco
diff --git a/osrc/Float.cyp → examples/Float/Float.cyp b/osrc/Float.cyp → examples/Float/Float.cyp
@@ -7,9 +7,9 @@ banik pyco
 tryda Ostrava {
     rynek(){
         toz cyslo_desetinne f pyco
-        f = 0.1001 - 0.2002 pyco
+        f = 0.74001 - 0.2002 pyco
         Konzola.pravit(f) pyco
-        dechrobok pyco
+
     }
 }
 

diff --git a/osrc/HeapDirty.cyp → examples/HeapDirty/HeapDirty.cyp b/osrc/HeapDirty.cyp → examples/HeapDirty/HeapDirty.cyp
diff --git a/osrc/HeapTenure.cyp → examples/HeapTenure/HeapTenure.cyp b/osrc/HeapTenure.cyp → examples/HeapTenure/HeapTenure.cyp
diff --git a/osrc/Overload.cyp → examples/Overload/Overload.cyp b/osrc/Overload.cyp → examples/Overload/Overload.cyp
diff --git a/osrc/Overload2.cyp → examples/Overoad2/Overload2.cyp b/osrc/Overload2.cyp → examples/Overoad2/Overload2.cyp
diff --git a/osrc/Prints.cyp → examples/Prints/Prints.cyp b/osrc/Prints.cyp → examples/Prints/Prints.cyp
@@ -8,8 +8,7 @@ tryda A {
     }
 
     Dryst naDryst(){
-        toz cyslo c = joch.c pyco
-        toz CysloCele cele = zrob CysloCele(c) pyco
+        toz CysloCele cele = zrob CysloCele(joch.c) pyco
         davaj cele.naDryst() pyco
     }
 }
@@ -24,16 +23,11 @@ tryda Ostrava{
         toz A a = zrob A(1020) pyco
 
         Konzola.pravit(a) pyco
-
-        Konzola.pravit(d) pyco
-        d = chuj pyco
         Konzola.pravit(d) pyco
 
         Konzola.pravit(i) pyco
         Konzola.pravit(c) pyco
         Konzola.pravit(b) pyco
-
-        dechrobok pyco
     }
 
 }

diff --git a/osrc/SATSolver/CNF.cyp → examples/SATSolver/CNF.cyp b/osrc/SATSolver/CNF.cyp → examples/SATSolver/CNF.cyp
diff --git a/osrc/SATSolver/Klauzule.cyp → examples/SATSolver/Klauzule.cyp b/osrc/SATSolver/Klauzule.cyp → examples/SATSolver/Klauzule.cyp
diff --git a/osrc/SATSolver/Ostrava.cyp → examples/SATSolver/Ostrava.cyp b/osrc/SATSolver/Ostrava.cyp → examples/SATSolver/Ostrava.cyp
diff --git a/osrc/SATSolver/Parsovac.cyp → examples/SATSolver/Parsovac.cyp b/osrc/SATSolver/Parsovac.cyp → examples/SATSolver/Parsovac.cyp
diff --git a/osrc/SATSolver/Promenna.cyp → examples/SATSolver/Promenna.cyp b/osrc/SATSolver/Promenna.cyp → examples/SATSolver/Promenna.cyp
diff --git a/osrc/SATSolver/Reseni.cyp → examples/SATSolver/Reseni.cyp b/osrc/SATSolver/Reseni.cyp → examples/SATSolver/Reseni.cyp
diff --git a/osrc/SATSolver/Resic.cyp → examples/SATSolver/Resic.cyp b/osrc/SATSolver/Resic.cyp → examples/SATSolver/Resic.cyp
diff --git a/osrc/Super2.cyp → examples/Super/Super.cyp b/osrc/Super2.cyp → examples/Super/Super.cyp
diff --git a/osrc/While.cyp → examples/While/While.cyp b/osrc/While.cyp → examples/While/While.cyp
diff --git a/osrc/Sample.cyp b/osrc/Sample.cyp
diff --git a/osrc/Simple.cyp b/osrc/Simple.cyp
diff --git a/osrc/Strings.cyp b/osrc/Strings.cyp
diff --git a/osrc/Super.cyp b/osrc/Super.cyp
diff --git a/osrc/Libraries/Bafr.cyp → ostrajava_lib/src/Bafr.cyp b/osrc/Libraries/Bafr.cyp → ostrajava_lib/src/Bafr.cyp
diff --git a/osrc/Libraries/Bazmek.cyp → ostrajava_lib/src/Bazmek.cyp b/osrc/Libraries/Bazmek.cyp → ostrajava_lib/src/Bazmek.cyp
diff --git a/osrc/Libraries/Citac.cyp → ostrajava_lib/src/Citac.cyp b/osrc/Libraries/Citac.cyp → ostrajava_lib/src/Citac.cyp
diff --git a/osrc/Libraries/CysloCele.cyp → ostrajava_lib/src/CysloCele.cyp b/osrc/Libraries/CysloCele.cyp → ostrajava_lib/src/CysloCele.cyp
diff --git a/osrc/Libraries/Dryst.cyp → ostrajava_lib/src/Dryst.cyp b/osrc/Libraries/Dryst.cyp → ostrajava_lib/src/Dryst.cyp
diff --git a/osrc/Libraries/Konzola.cyp → ostrajava_lib/src/Konzola.cyp b/osrc/Libraries/Konzola.cyp → ostrajava_lib/src/Konzola.cyp
diff --git a/osrc/Libraries/Pole.cyp → ostrajava_lib/src/Pole.cyp b/osrc/Libraries/Pole.cyp → ostrajava_lib/src/Pole.cyp
diff --git a/resources/sats/05.txt b/resources/sats/05.txt
@@ -1,92 +1,21 @@
-c FILE: aim-50-1_6-yes1-4.cnf
+c quinn.cnf
 c
-c SOURCE: Kazuo Iwama, Eiji Miyano (miyano@cscu.kyushu-u.ac.jp),
-c          and Yuichi Asahiro
-c
-c DESCRIPTION: Artifical instances from generator by source.  Generators
-c              and more information in sat/contributed/iwama.
-c
-c NOTE: Satisfiable
-c
-c 01000100011001110111011110000001001100110111011001
-p cnf 50 80
-16 17 30 0
--17 22 30 0
--17 -22 30 0
-16 -30 47 0
-16 -30 -47 0
--16 -21 31 0
--16 -21 -31 0
--16 21 -28 0
--13 21 28 0
-13 -16 18 0
-13 -18 -38 0
-13 -18 -31 0
-31 38 44 0
--8 31 -44 0
-8 -12 -44 0
-8 12 -27 0
-12 27 40 0
--4 27 -40 0
-12 23 -40 0
--3 4 -23 0
-3 -23 -49 0
-3 -13 -49 0
--23 -26 49 0
-12 -34 49 0
--12 26 -34 0
-19 34 36 0
--19 26 36 0
--30 34 -36 0
-24 34 -36 0
--24 -36 43 0
-6 42 -43 0
--24 42 -43 0
--5 -24 -42 0
-5 20 -42 0
-5 -7 -20 0
-4 7 10 0
--4 10 -20 0
-7 -10 -41 0
--10 41 46 0
--33 41 -46 0
-33 -37 -46 0
-32 33 37 0
-6 -32 37 0
--6 25 -32 0
--6 -25 -48 0
--9 28 48 0
--9 -25 -28 0
-19 -25 48 0
-2 9 -19 0
--2 -19 35 0
--2 22 -35 0
--22 -35 50 0
--17 -35 -50 0
--29 -35 -50 0
--1 29 -50 0
-1 11 29 0
--11 17 -45 0
--11 39 45 0
--26 39 45 0
--3 -26 45 0
--11 15 -39 0
-14 -15 -39 0
-14 -15 -45 0
-14 -15 -27 0
--14 -15 47 0
-17 17 40 0
-1 -29 -31 0
--7 32 38 0
--14 -33 -47 0
--1 2 -8 0
-35 43 44 0
-21 21 24 0
-20 29 -48 0
-23 35 -37 0
-2 18 -33 0
-15 25 -45 0
-9 14 -38 0
--5 11 50 0
--3 -13 46 0
--13 -41 43 0
+p cnf 16 18
+1 2 0
+-2 -4 0
+3 4 0
+-4 -5 0
+5 -6 0
+6 -7 0
+6 7 0
+7 -16 0
+8 -9 0
+-8 -14 0
+9 10 0
+9 -10 0
+-10 -11 0
+10 12 0
+11 12 0
+13 14 0
+14 -15 0
+15 16 0