fixed relative imports, added all routes, updated README

xR86 · xR86 · commit ab3c2d7397cf · 2017-07-23T00:58:12.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 
 # Ignore backups
 **/*_safe/*
+safe_*
 
 # Ignore compiled
 **/*.pyc
diff --git a/README.md b/README.md
@@ -1,4 +1,12 @@
 # Numerical-Analysis-
 
 ### Installation
-`pip install -r requirements.txt` to get started
+`pip install -r requirements.txt` to get started  
+To run the app, run `make.bat` if you're on Windows, `make` otherwise (equivalent to `python app.py` ?).
+
+### TODO:
++ relative reference introduced in subprojects, they work standalone and integrated in app.py
+  + change `/` -> `/precision` for example is not `localhost:5000/precision`, but `localhost:5000/tema1/precision`
+  + same for files loaded from txt
+  + patched - modules loaded in subprojects are now loaded relative
++ make an index for `front.py` (or make an `SPA` with ng1)
diff --git a/Tema1/__init__.py b/Tema1/__init__.py
diff --git a/Tema1/tema_GUI.py b/Tema1/tema_GUI.py
@@ -1,4 +1,5 @@
-import tema as tm
+#import tema as tm
+from . import tema as tm
 
 from flask import Flask
 from flask import render_template
diff --git a/Tema2/__init__.py b/Tema2/__init__.py
diff --git a/Tema2/tema.py b/Tema2/tema.py
@@ -1,4 +1,5 @@
-import util
+# import util
+from . import util
 from sympy import Matrix
 
 
diff --git a/Tema2/tema_GUI.py b/Tema2/tema_GUI.py
@@ -1,4 +1,5 @@
-from tema import LDL_Decomposition
+#from tema import LDL_Decomposition
+from .tema import LDL_Decomposition
 from sympy import Matrix
 
 from flask import Flask
diff --git a/Tema3/__init__.py b/Tema3/__init__.py
diff --git a/Tema3/hw3_test.py b/Tema3/hw3_test.py
@@ -1,7 +1,9 @@
 import time
 from datetime import timedelta
-from Sparse import Sparse
-from cn_parser import Parser
+# from Sparse import Sparse
+# from cn_parser import Parser
+from .Sparse import Sparse
+from .cn_parser import Parser
 
 
 class Test:
diff --git a/Tema3/hw4_solver.py b/Tema3/hw4_solver.py
@@ -1,4 +1,5 @@
-from cn_parser import Parser
+# from cn_parser import Parser
+from .cn_parser import Parser
 import math
 from decimal import Decimal
 
diff --git a/Tema3/tema_GUI.py b/Tema3/tema_GUI.py
@@ -1,5 +1,7 @@
-from hw3_test import Test
-from hw4_solver import Gauss
+# from hw3_test import Test
+# from hw4_solver import Gauss
+from .hw3_test import Test
+from .hw4_solver import Gauss
 
 # from util import ListStream
 
diff --git a/Tema5/__init__.py b/Tema5/__init__.py
diff --git a/Tema5/tema_GUI.py b/Tema5/tema_GUI.py
@@ -1,4 +1,5 @@
-from inverse_calculator import Inverse
+# from inverse_calculator import Inverse
+from .inverse_calculator import Inverse
 
 # from util import ListStream
 
diff --git a/Tema6/__init__.py b/Tema6/__init__.py
diff --git a/Tema6/eigen_values.py b/Tema6/eigen_values.py
@@ -1,4 +1,4 @@
-from cn_parser import Parser
+from .cn_parser import Parser
 from decimal import Decimal
 import math
 from random import random, randint, uniform
diff --git a/Tema6/tema_GUI.py b/Tema6/tema_GUI.py
@@ -1,4 +1,5 @@
-from eigen_values import Solver
+# from eigen_values import Solver
+from .eigen_values import Solver
 
 # from util import ListStream
 
diff --git a/app.py b/app.py
@@ -3,14 +3,22 @@
 import front as frontend
 from front import app as front
 #from Tema1 import tema_GUI as tema1
-
+from Tema1.tema_GUI import app as tema1
+from Tema2.tema_GUI import app as tema2
+from Tema3.tema_GUI import app as tema3
+from Tema5.tema_GUI import app as tema5
+from Tema6.tema_GUI import app as tema6
 
 # flask version
 from flask import Flask
 application = Flask(__name__)
 
 application.wsgi_app = DispatcherMiddleware(front, {
-    '/tema1': tema1
+    '/tema1': tema1,
+    '/tema2': tema2,
+    '/tema3': tema3,
+    '/tema5': tema5,
+    '/tema6': tema6
 })
 
 application.run(debug=True)
