summaryrefslogtreecommitdiff
path: root/math/fudgit/files/patch-ab
blob: 6fe1e20739af7bc7566266c7ed61e461c3dbd67b (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
*** src/command.c.orig	Mon Nov  7 15:23:31 1994
--- src/command.c	Mon Aug  5 06:32:38 1996
***************
*** 244,249 ****
--- 244,251 ----
  		"legendre series: n = 1,...N { Pn(X) }"},
  	{"lo!rentzian", do_stfunc, "set function lorentzian", "",
  	    "Lorentzian series: n = 3, 6...N { A[n-1]*((X*A[n])^2/((X^2-A[n-2]^2)^2+(X*A[n])^2) }"},
+ 	{"n!one", do_stfunc, "set function none", "",
+ 		"none"},
  	{"p!olynomial", do_stfunc, "set function polynomial", "",
  		"power series: n = 1,...N { A[n]*X^(n-1) }"},
  	{"u!ser", do_stfunc, "set function user", "definition",
***************
*** 268,273 ****
--- 270,277 ----
  		"least square linear regression"},
  	{"m!l_fit", do_stmeth, "set method ml_fit", "",
  		"Marquardt-Levenberg iterative nonlinear fit"},
+ 	{"n!one", do_stmeth, "set method none", "",
+ 		"none"},
  	{"s!vd_fit", do_stmeth, "set method svd_fit", "",
  		"singular value decomposition linear fit"},
  	{ 0,	 0,		0,		0,		0 }
*** src/fudgit.h.orig	Thu Sep  8 16:02:47 1994
--- src/fudgit.h	Mon Aug  5 06:32:38 1996
***************
*** 97,103 ****
   * name.
   * Ideally, this exception is left for .fudgitrc.
   */
! /* #define EXTENSION  ".ft"  */
  /* The following are required when defining argument prototypes of
   * loaded routines.
   */
--- 97,103 ----
   * name.
   * Ideally, this exception is left for .fudgitrc.
   */
! #define EXTENSION  ".ft"
  /* The following are required when defining argument prototypes of
   * loaded routines.
   */
*** src/setshow.c.orig	Mon Nov  7 07:57:49 1994
--- src/setshow.c	Mon Aug  5 06:32:39 1996
***************
*** 67,73 ****
  int Ft_Funci;
  
  Meth Ft_Method[METHNUM] = {
! 	{"none", "none"},
  	{"ls_r!eg", "least square linear regression"},
  	{"lad!_reg", "least absolute deviation linear regression"},
  	{"ls_f!it", "least square linear fit"},
--- 67,73 ----
  int Ft_Funci;
  
  Meth Ft_Method[METHNUM] = {
! 	{"n!one", "none"},
  	{"ls_r!eg", "least square linear regression"},
  	{"lad!_reg", "least absolute deviation linear regression"},
  	{"ls_f!it", "least square linear fit"},
***************
*** 76,82 ****
  };
  
  Func Ft_Function[FUNCNUM] = {
! 	{"none", "none"},
  	{"str!aight", "straight line"},
  	{"po!lynomial", "polynomial"},
  	{"leg!endre", "Legendre polynomial"},
--- 76,82 ----
  };
  
  Func Ft_Function[FUNCNUM] = {
! 	{"n!one", "none"},
  	{"str!aight", "straight line"},
  	{"po!lynomial", "polynomial"},
  	{"leg!endre", "Legendre polynomial"},
*** src/vgetargp.c.orig	Fri Sep  2 23:02:47 1994
--- src/vgetargp.c	Mon Aug  5 06:32:39 1996
***************
*** 75,93 ****
  
  	/* go along the string  */
  	while (*b != '\0' && argno < MAXTOKEN) {
! 		switch (*b) {
  #ifdef BACKSLASH
! 		case '\\':	/* only recognize \$ in non fmodes  */
! 			if (leavequotes == ERRR) {
! 				leavequotes = (	Ft_almost(p[0], "pm!ode") ||
! 								Ft_almost(p[0], "cm!ode") ||
! 								Ft_almost(p[0], "le!t")   );
! 			}
! 			if (expansion && b[1] != '\n' && (!leavequotes || b[1] == '$')) {
! 				b++;
! 			}
! 			COPY(b);
! 			break;
  #endif
  		case SQUOTE:  /* take following as one string, + turn off exp */
  			if (leavequotes == 1 || indquotes || inpar) {
--- 75,187 ----
  
  	/* go along the string  */
  	while (*b != '\0' && argno < MAXTOKEN) {
! 		switch (*b)
! 			{
  #ifdef BACKSLASH
! 			/* add support for C-style escape sequences */
! 			case '\\':
! 				{
! 					if (leavequotes == ERRR) {
! 						leavequotes = (
! 							Ft_almost(p[0], "pm!ode") ||
! 							Ft_almost(p[0], "cm!ode") ||
! 							Ft_almost(p[0], "le!t")   );
! 					}
! 
! 					/* only recognize escape sequences in non fmodes  */
! 					if (expansion && b[1] != '\n' && (!leavequotes || b[1] == '$')) {
! 						int dummy = -1;
! 						int * dptr = &dummy;
! 						b++;			/* skip over '\\' */
! 
! 						switch (*b)
! 							{
! 							case '\0':
! 								break;
! 							case '\'':
! 								dummy = '\'';
! 								break;
! 							case '\"':
! 								dummy = '\"';
! 								break;
! 							case '$':
! 								dummy = '$';
! 								break;
! 							case '?':
! 								dummy = '\?';
! 								break;
! 							case 'a':
! 								dummy = '\a';
! 								break;
! 							case 'b':
! 								dummy = '\b';
! 								break;
! 							case 'f':
! 								dummy = '\f';
! 								break;
! 							case 'n':
! 								dummy = '\n';
! 								break;
! 							case 'r':
! 								dummy = '\r';
! 								break;
! 							case 't':
! 								dummy = '\t';
! 								break;
! 							case 'x':
! 								if (!isxdigit(b[1]))
! 									break;
! 								b++;
! 								dummy = tolower(*b) -
! 									(isdigit(*b) ? '0' : ('a' - 10));
! 								if (!isxdigit(b[1]))
! 									break;
! 								b++;
! 								dummy *= 16;
! 								dummy += tolower(*b) -
! 									(isdigit(*b) ? '0' : ('a' - 10));
! 								break;
! 							case 'v':
! 								dummy = '\v';
! 								break;
! 							case '0':
! 							case '1':
! 							case '2':
! 							case '3':
! 							case '4':
! 							case '5':
! 							case '6':
! 							case '7':
! 								dummy = *b - '0';
! 								if ((b[1] < '0') || (b[1] > '7'))
! 									break;
! 								b++;
! 								dummy *= 8;
! 								dummy += *b - '0';
! 								if ((b[1] < '0') || (b[1] > '7'))
! 									break;
! 								b++;
! 								dummy *= 8;
! 								dummy += *b - '0';
! 								break;
! 							case '\\':
! 								dummy = '\\';
! 								break;
! 							default:
! 								break;
! 							}
! 						if (dummy < 0) {
! 							dummy = '\\';
! 						} else {
! 							b++;
! 						}
! 						COPY(dptr);
! 						break;
! 					} else {
! 						COPY(b);
! 						break;
! 					}
! 				}
  #endif
  		case SQUOTE:  /* take following as one string, + turn off exp */
  			if (leavequotes == 1 || indquotes || inpar) {