Skip to content
Snippets Groups Projects
Unverified Commit 68a611f7 authored by Recolic Keghart's avatar Recolic Keghart
Browse files

Adjust unexposed method name... so that `from quickmap import *` works better.

parent df957824
No related branches found
No related tags found
No related merge requests found
......@@ -2,15 +2,14 @@
import sys
sys.path.append('..')
import quickmap
from quickmap import GetMultiMap, GetLine
from quickmap import *
x1,y1 = quickmap.DataFileToXYArray('without_damping.dat')
x2,y2 = quickmap.DataFileToXYArray('with_damping.dat')
x1,y1 = DataFileToXYArray('without_damping.dat')
x2,y2 = DataFileToXYArray('with_damping.dat')
GetMultiMap(GetLine(x1, y1, smoothLine=True) + GetLine(x2, y2, smoothLine=True))
sq_T = '14.633 19.327 24.256 29.192 34.589 39.547'.split(' ')
sq_T = [float(e) for e in sq_T]
m = [0,10,20,30,40,50]
quickmap.GetMap(m,sq_T,polyLine=True)
GetMap(m,sq_T,polyLine=True)
......@@ -11,7 +11,7 @@ from scipy.interpolate import spline
from deprecated import deprecated
def dotMultiply(vctA, vctB):
def _dotMultiply(vctA, vctB):
if len(vctA) != len(vctB):
print("Error: While vcta is ", vctA, " and vctb is ", vctB)
raise ValueError("dotmulti needs lena == lenb.")
......@@ -92,7 +92,7 @@ def GetLine(arrX, arrY, name=fetchAnonymousLineName(), extendXRate=1, extendYRat
vctX = [x ** power for power in range(poly_maxXPower + 1)]
if poly_passO:
vctX[0] = 0
return dotMultiply(k, vctX)
return _dotMultiply(k, vctX)
def lossFunc(k, x, y): return abs(lineFunc(k, x) - y)
......@@ -111,10 +111,10 @@ def GetLine(arrX, arrY, name=fetchAnonymousLineName(), extendXRate=1, extendYRat
if polyLine:
if poly_inverseK:
py = numpy.linspace(minY, maxY, 1000)
px = dotMultiply(kFinal, [py ** power for power in range(poly_maxXPower + 1)])
px = _dotMultiply(kFinal, [py ** power for power in range(poly_maxXPower + 1)])
else:
px = numpy.linspace(minX, maxX, 1000)
py = dotMultiply(kFinal, [px ** power for power in range(poly_maxXPower + 1)])
py = _dotMultiply(kFinal, [px ** power for power in range(poly_maxXPower + 1)])
elif smoothLine:
px = numpy.linspace(minX, maxX, 1000)
py = spline(X, Y, px)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment