merged old files

diff --git a/UE/lib.py b/UE/lib.py
index 88369c0eb8ecbae196da498b49a72d442c6ff5a6..830b3f0de85c94d74afcddbb5b0457582b2307ae 100644 (file)
--- a/UE/lib.py
+++ b/UE/lib.py
@@ -146,23 +146,23 @@ def euklid_tex(a, b):
         b = -b
         y[1] = -1
     q = int(a / b)
         b = -b
         y[1] = -1
     q = int(a / b)

-    print "\\begin{array}{ccccccc}"
-    print "  r_{i-2} & r_{i-1} & q_i & x_{i-2} & x_{i-1} & y_{i-2} & y_{i-1}\\\\\\hline"
-    print " ", a, "&" , b , "&" , q, "&" , x[0], "&", x[1] , "&", y[0] , "&" , y[1], "\\\\"
+    print("\\begin{array}{ccccccc}")
+    print("  r_{i-2} & r_{i-1} & q_i & x_{i-2} & x_{i-1} & y_{i-2} & y_{i-1}\\\\\\hline")
+    print(" ", a, "&" , b , "&" , q, "&" , x[0], "&", x[1] , "&", y[0] , "&" , y[1], "\\\\")

     while a % b:
         [a , b] = [b, a - q * b]
         x = [x[1], x[0] - q * x[1]]
         y = [y[1], y[0] - q * y[1]]
         q = int(a / b)
         if a % b:
     while a % b:
         [a , b] = [b, a - q * b]
         x = [x[1], x[0] - q * x[1]]
         y = [y[1], y[0] - q * y[1]]
         q = int(a / b)
         if a % b:

-            print " ", a, "&" , b , "&" , q, "&" , x[0], "&", x[1] , "&", y[0] , "&" , y[1], "\\\\"
+            print(" ", a, "&" , b , "&" , q, "&" , x[0], "&", x[1] , "&", y[0] , "&" , y[1], "\\\\")

         else:
         else:

-            print " \\cline{2-2}\\cline{5-5}\\cline{7-7}"
-            print " \multicolumn{1}{l|}{", a, "}& \multicolumn{1}{l|}{" , b ,
-            print "}&&\multicolumn{1}{l|}{" , x[0], "}&\multicolumn{1}{l|}{", x[1] ,
-            print "}&\multicolumn{1}{l|}{", y[0] , "}&\multicolumn{1}{l|}{" , y[1], "}\\\\"
-            print " \\cline{2-2}\\cline{5-5}\\cline{7-7}"
-    print "\\end{array}",
+            print(" \\cline{2-2}\\cline{5-5}\\cline{7-7}")
+            print(" \multicolumn{1}{l|}{", a, "}& \multicolumn{1}{l|}{" , b ,)
+            print("}&&\multicolumn{1}{l|}{" , x[0], "}&\multicolumn{1}{l|}{", x[1] ,)
+            print("}&\multicolumn{1}{l|}{", y[0] , "}&\multicolumn{1}{l|}{" , y[1], "}\\\\")
+            print(" \\cline{2-2}\\cline{5-5}\\cline{7-7}")
+    print("\\end{array}",)

     return [b, x[1], y[1]]
 
 # groesster gemeinsamer Teiler 
     return [b, x[1], y[1]]
 
 # groesster gemeinsamer Teiler 


@@ -239,7 +239,7 @@ def legendre_tex(z, n):
     stack = [[z, n], [0, 0]]
     l = -1
     d = +1
     stack = [[z, n], [0, 0]]
     l = -1
     d = +1

-    print "\\begin{align}"
+    print("\\begin{align}")

     while len(stack) > 1:
         [z, n] = stack.pop(0)
 
     while len(stack) > 1:
         [z, n] = stack.pop(0)
 


@@ -247,16 +247,16 @@ def legendre_tex(z, n):
             stack.append([0, 0])
             l = l + 1
             if(l == 0):
             stack.append([0, 0])
             l = l + 1
             if(l == 0):

-                print "\n &=",
+                print("\n &=",)

             elif(l > 3):
             elif(l > 3):

-                print "\\\\ \n &=",
+                print("\\\\ \n &=",)

                 l = 1
             else:
                 l = 1
             else:

-                print "\n =",
+                print("\n =",)

             if(d < 0):
             if(d < 0):

-                print "-",
+                print("-",)

             continue
             continue

-        print " \\legend[L]{", z, "}{", n, "}",
+        print(" \\legend[L]{", z, "}{", n, "}",)

         
         if(z > n):
             stack.append([z % n, n])
         
         if(z > n):
             stack.append([z % n, n])


@@ -283,15 +283,16 @@ def legendre_tex(z, n):
         if (n % 4 == 3 and z % 4 == 3):
             d = d * (-1)
     
         if (n % 4 == 3 and z % 4 == 3):
             d = d * (-1)
     

-    print
-    print " =", d        
-    print "\\end{align}"    
+    print()
+    print(" =", d )
+    print("\\end{align}")

     return d
 
 # Jacobi Symbol
 def jacobi(z, n):
     d = +1
     while 1:
     return d
 
 # Jacobi Symbol
 def jacobi(z, n):
     d = +1
     while 1:

+#        print(z, "/", n)

         if(z > n):
             z = z % n
             continue
         if(z > n):
             z = z % n
             continue


@@ -322,22 +323,22 @@ def jacobi(z, n):
 def jacobi_tex(z, n):
     l = -2
     d = +1
 def jacobi_tex(z, n):
     l = -2
     d = +1

-    print "\\begin{align}"
+    print("\\begin{align}")

     while 1:
 
         l = l + 1
         if(l == 0):
     while 1:
 
         l = l + 1
         if(l == 0):

-            print " \n&=",
+            print(" \n&=",)

             l = 1
         elif(l > 3):
             l = 1
         elif(l > 3):

-            print "\\\\ \n&=",
+            print("\\\\ \n&=",)

             l = 1
         elif(l>0):
             l = 1
         elif(l>0):

-            print "\n=",
+            print("\n=",)

         if(d < 0):
         if(d < 0):

-            print "-",
+            print("-",)

 
 

-        print " \\legend[J]{", z, "}{", n, "}",
+        print(" \\legend[J]{", z, "}{", n, "}",)

         
 
         if(z > n):
         
 
         if(z > n):


@@ -364,9 +365,9 @@ def jacobi_tex(z, n):
         if (n % 4 == 3 and z % 4 == 3):
             d = d * (-1)
     
         if (n % 4 == 3 and z % 4 == 3):
             d = d * (-1)
     

-    print
-    print "=", d        
-    print "\\end{align}"
+    print()
+    print("=", d)
+    print("\\end{align}")

     return d
 
 
     return d
 
 


@@ -382,17 +383,19 @@ def sqmult(x,k,func=lambda x,y:x*y,e=1):
 
 #Square and Multiply (x,k,*,e) mit TeX Ausgabe
 def sqmult_tex(x,k,func,e):
 
 #Square and Multiply (x,k,*,e) mit TeX Ausgabe
 def sqmult_tex(x,k,func,e):

-    y = e
-    print "\\begin{array}{cccc}"
-    print "  x & y & k & k \\mod 2\\\\\\hline"
-    print " ", x, "&" , y , "&" , k, "&" , k%2, "\\\\"
+
+    y = e;
+    print("\\begin{array}{cccc}")
+    print("  x & y & k & k \\mod 2\\\\\\hline")
+    print(" ", x, "&" , y , "&" , k, "&" , k%2, "\\\\")
+

     while k:
         if(k%2):
             y = func(y,x)
         x = func(x,x)
         k = k/2
     while k:
         if(k%2):
             y = func(y,x)
         x = func(x,x)
         k = k/2

-        print " ", x, "&" , y , "&" , k, "&" , k%2, "\\\\"
-    print "\\end{array}"
+        print(" ", x, "&" , y , "&" , k, "&" , k%2, "\\\\")
+    print("\\end{array}")

     return y
 
 # Berechnet die Fermat'sche Zahl F_n
     return y
 
 # Berechnet die Fermat'sche Zahl F_n


@@ -463,7 +466,7 @@ def fermatfak(N,k=1):
     while u<=(N+1)/2:
         if(int((u**2-N)**0.5)==(u**2-N)**0.5):
             v = int((u**2-N)**0.5)
     while u<=(N+1)/2:
         if(int((u**2-N)**0.5)==(u**2-N)**0.5):
             v = int((u**2-N)**0.5)

-            print v
+            print(v)

             return [u+v,u-v]
         u = u+1
 
             return [u+v,u-v]
         u = u+1
 

diff --git a/UE/python.sty b/UE/python.sty
index 3be2ba5f4c952fe9d1f10766b812e306e528d892..38a2f2db142f2a52632838b432e3cb23d1e7a267 100644 (file)
--- a/UE/python.sty
+++ b/UE/python.sty
@@ -102,4 +102,4 @@
 % \gdef\@prepython{#1}
 % }
 % sed -e 's/^  //g' cluster.py
 % \gdef\@prepython{#1}
 % }
 % sed -e 's/^  //g' cluster.py

-% \immediate\write18{\@prepython\space\jobname.py > \
\ No newline at end of file
+% \immediate\write18{\@prepython\space\jobname.py > \

diff --git a/UE/python/test.tex b/UE/python/test.tex
index 95ee277e793dd8ebbd6ff7a168dfd42f8ff2af55..64d736e08bda0c210c6b3adc17f5974725ef5857 100644 (file)
--- a/UE/python/test.tex
+++ b/UE/python/test.tex
@@ -3,11 +3,11 @@
 
 
 \usepackage[utf8x]{inputenc}
 
 
 \usepackage[utf8x]{inputenc}

-\usepackage{amsmath,amssymb,ulsy,amsthm}
+\usepackage{amsmath,amssymb,amsthm}

 \usepackage{fullpage}
 %\usepackage{txfonts}
 \usepackage[ngerman]{babel}
 \usepackage{fullpage}
 %\usepackage{txfonts}
 \usepackage[ngerman]{babel}

-\usepackage{fixltx2e}   %Deutschsprach Bugs
+%\usepackage{fixltx2e}   %Deutschsprach Bugs

 %\usepackage[T1]{fontenc}
 %\usepackage{lmodern}
 
 %\usepackage[T1]{fontenc}
 %\usepackage{lmodern}
 

diff --git a/UE/template.sty b/UE/template.sty
index e44cad421a77d802ab039d4ad9671e26aaad7204..7a926ca9161b33509089fbdf2a16d62695f15311 100644 (file)
--- a/UE/template.sty
+++ b/UE/template.sty
@@ -1,10 +1,11 @@
 \usepackage[utf8x]{inputenc}
 \usepackage[ngerman]{babel}
 \usepackage[utf8x]{inputenc}
 \usepackage[ngerman]{babel}

-\usepackage{fixltx2e}   %Deutschsprach Bugs
+%\usepackage{fixltx2e}   %Deutschsprach Bugs

 
 \usepackage{fullpage}
 
 
 \usepackage{fullpage}
 

-\usepackage{amsmath,amssymb,ulsy,amsthm}
+\usepackage{amsmath,amssymb,amsthm}
+%\usepackage{ulsy}

 
 \usepackage{color}
 \usepackage{graphicx}
 
 \usepackage{color}
 \usepackage{graphicx}

diff --git a/UE/ue1.pdf b/UE/ue1.pdf
index 03e3756944ae596bf5aad4ba51c4b90f2b775f40..b374d6a3403d6db38c2ed79d66b81d2195064d6f 100644 (file)
Binary files a/UE/ue1.pdf and b/UE/ue1.pdf differ

diff --git a/pic/IMG_20120418_120320.jpg b/pic/IMG_20120418_120320.jpg
index 11057cb77e582431bb3d01c79fb71ca6a121df6d..792f3a5e2ec5a135f55827a7d58ea50dc3d7237f 100755 (executable)
Binary files a/pic/IMG_20120418_120320.jpg and b/pic/IMG_20120418_120320.jpg differ