Navigation

Changeset 724

Timestamp:

08/09/10 23:28:14 (1 year ago)

Author:

dmitrey

Message:

some changes for FD and DA + 2 FD testcases

Files:

r564	r724
13	13	"""
14	14	Usage: get_d1(fun, x, diffInt=1.5e-8, pointVal = None, args=(), stencil = 3, varForDifferentiation = None, exactShape = False)
15		fun: R^n -> R^m, x0 from R^n: function and point where derivatives should be obtained
	15	fun: R^n -> R^m, x: Python list (not tuple!) or numpy array from R^n: function and point where derivatives should be obtained
16	16	diffInt - step for stencil
17	17	pointVal - fun(x) if known (it is used from OpenOpt and FuncDesigner)
…	…
28	28	if atleast_1d(diffInt).size > 1: assert type(vars) == ndarray, 'not implemented yet'
29	29
30		if type(vars) not in [list, tuple] or isscalar(vars[0]):
	30	if type(vars) == tuple:
	31	Vars = [asfarray(var) for var in vars]
	32	elif type(vars) not in [list, tuple] or isscalar(vars[0]):
31	33	Vars = [vars, ]
32	34	else:
…	…
56	58	else:
57	59	S = asfarray([Args[i]])
58
	60	S = atleast_1d(S)
59	61	agregate_counter = 0
60	62	assert asarray(Args[i]).ndim <= 1, 'derivatives for more than single dimension variables are not implemented yet'
…	…
73	75	for j in xrange(S.size):
74	76	di = float(asscalar(diff_int[j]))
75		tmp = S[j]
	77	tmp = S[j] #if S.ndim > 0 else asscalar(S)
76	78	di = diff_int[j]
77	79	di2 = di / 2.0
…	…
113	115
114	116	r.append(asfarray(d1))
115		if varForDifferentiation is not None or isscalar(vars) or (type(vars) in [list, tuple, ndarray] and isscalar(vars[0])): r = d1
	117
	118	if varForDifferentiation is not None or isscalar(vars): r = d1
116	119	else: r = tuple(r)
117	120	return r

r723	r724
914	914
915	915	#assert all([elem.ndim > 1 for elem in derivativeSelf])
	916	# assert len(derivativeSelf[0])!=16
	917	#assert (type(derivativeSelf[0]) in (int, float)) or derivativeSelf[0][0]>480.00006752 or derivativeSelf[0][0]<480.00006750
916	918	return derivativeSelf
917	919

r723	r724
14	14	def __init__(self, args, *kwargs):
15	15	if args:
16		items = [(key, asfarray(val) if type(val) != ndarray else val) for key, val in args[0]]
	16	items = [(key, asfarray(val) if type(val) != ndarray else val) for key, val in args[0]] if not isinstance(args[0], dict) else args[0].items()
17	17	elif kwargs:
18	18	items = [(key, asfarray(val) if type(val) != ndarray else val) for key, val in kwargs.items()]

r723	r724
7	7	class oovar(oofun):
8	8	is_oovar = True
9		shape = nan
10		fixed = False
11		initialized = False
	9	#shape = nan
	10	#fixed = False
	11	#initialized = False
12	12	is_linear = True
13	13	_unnamedVarNumber = 1#static variable for oovar class