legacy/oldnonlinear/removedef.hl

   1 (* deprecated 2013-08-17.
   2 removed from Function_list.function_list:
   3
   4    Functional_equation.x1cube;
   5 Functional_equation.functional_arclength_234;
   6 Functional_equation.functional_arclength_126;
   7 Functional_equation.functional_dih3_x_div_sqrtdelta_posbranch;
   8 Functional_equation.functional_dih5_x_div_sqrtdelta_posbranch;
   9 Functional_equation.functional_dih_x_126_s2;
  10 Functional_equation.functional_dih2_x_126_s2;
  11 Functional_equation.functional_dih3_x_126_s2;
  12 Functional_equation.functional_dih4_x_126_s2;
  13 Functional_equation.functional_dih5_x_126_s2;
  14 Functional_equation.functional_dih6_x_126_s2;
  15 Functional_equation.functional_dih_x_135_s2;
  16 Functional_equation.functional_dih2_x_135_s2;
  17 Functional_equation.functional_dih3_x_135_s2;
  18 Functional_equation.functional_dih4_x_135_s2;
  19 Functional_equation.functional_dih5_x_135_s2;
  20 Functional_equation.functional_dih6_x_135_s2;
  21 Functional_equation.functional_ldih_x_126_s2;
  22 Functional_equation.functional_ldih2_x_126_s2;
  23 Functional_equation.functional_ldih6_x_126_s2;
  24 Functional_equation.functional_ldih_x_135_s2;
  25 Functional_equation.functional_ldih3_x_135_s2;
  26 Functional_equation.functional_ldih5_x_135_s2;
  27 Functional_equation.functional_edge_flat2_x;
  28 Functional_equation.functional_euler_3flat_x;
  29 Functional_equation.functional_euler_2flat_x;
  30 Functional_equation.functional_euler_1flat_x;
  31 Functional_equation.functional_taum_3flat_x;
  32 Functional_equation.functional_taum_2flat_x;
  33 Functional_equation.functional_taum_1flat_x;
  34 Functional_equation.functional_delta_x_126_s2;
  35 Functional_equation.functional_delta_x_135_s2;
  36 Functional_equation.functional_delta_pent_x;
  37 Functional_equation.functional_vol3_x_135_s2;
  38 Functional_equation.functional_ldih_x_n;
  39 Functional_equation.functional_ldih_x_126_n;
  40 Functional_equation.functional_ldih2_x_126_n;
  41 Functional_equation.functional_ldih6_x_126_n;
  42 Functional_equation.functional_ldih_x_135_n;
  43 Functional_equation.functional_ldih3_x_135_n;
  44 Functional_equation.functional_ldih5_x_135_n;
  45 Functional_equation.functional_taum_x1;
  46 Functional_equation.functional_taum_x2;
  47 Functional_equation.functional_taum_x1_x2;
  48 Functional_equation.functional_delta_sub1_x;
  49 Functional_equation.functional_taum_sub1_x;
  50 Functional_equation.functional_taum_sub246_x;
  51 Functional_equation.functional_taum_sub345_x;
  52
  53 let legacy = ["unit", "x1", "x2", "x3", "x4", "x5", "x6", "y1", "y2",
  54  "y3", "y4", "y5", "y6", "delta_x", "delta_x4", "x1_delta_x",
  55  "delta4_squared_x", "vol_x", "sol", "rad2", "dih", "dih2", "dih3",
  56  "dih4", "dih5", "dih6", "ldih_x", "ldih2_x", "ldih3_x", "ldih5_x",
  57  "ldih6_x", "upper_dih_x", "eulerA_x", "rhazim_x", "rhazim2_x",
  58  "rhazim3_x", "gchi1_x", "gchi2_x", "gchi3_x", "gchi4_x", "gchi5_x",
  59  "gchi6_x", "x1cube", "x1square", "num1", "num2", "num_combo1", "rat1",
  60  "rat2", "den2", "edge_flat2_x", "edge_flat_x", "flat_term_x", "taum_x",
  61  "halfbump_x1", "halfbump_x4", "eta2_126", "eta2_135", "eta2_234",
  62  "eta2_456", "vol3_x_sqrt", "vol3f_x_lfun", "vol3f_x_sqrt2_lmplus",
  63  "arclength_x_123", "arclength_x_234", "arclength_x_126",
  64  "arclength_x_345", "norm2hh_x", "asn797k", "asnFnhk", "lfun_y1",
  65  "acs_sqrt_x1_d4", "acs_sqrt_x2_d4", "sol_euler_x_div_sqrtdelta",
  66  "sol_euler345_x_div_sqrtdelta", "sol_euler156_x_div_sqrtdelta",
  67  "sol_euler246_x_div_sqrtdelta", "dih_x_div_sqrtdelta_posbranch",
  68  "dih2_x_div_sqrtdelta_posbranch", "dih3_x_div_sqrtdelta_posbranch",
  69  "dih4_x_div_sqrtdelta_posbranch", "dih5_x_div_sqrtdelta_posbranch",
  70  "dih6_x_div_sqrtdelta_posbranch", "ldih_x_div_sqrtdelta_posbranch",
  71  "ldih2_x_div_sqrtdelta_posbranch", "ldih3_x_div_sqrtdelta_posbranch",
  72  "ldih4_x_div_sqrtdelta_posbranch", "ldih5_x_div_sqrtdelta_posbranch",
  73  "ldih6_x_div_sqrtdelta_posbranch", "surf_x", "vol3r_126_x",
  74  "dih_x_126_s2", "dih2_x_126_s2", "dih3_x_126_s2", "dih4_x_126_s2",
  75  "dih5_x_126_s2", "dih6_x_126_s2", "ldih_x_126_s2", "ldih2_x_126_s2",
  76  "ldih6_x_126_s2", "dih_x_135_s2", "dih2_x_135_s2", "dih3_x_135_s2",
  77  "dih4_x_135_s2", "dih5_x_135_s2", "dih6_x_135_s2", "ldih_x_135_s2",
  78  "ldih3_x_135_s2", "ldih5_x_135_s2", "lfun_sqrtx1_div2",
  79  "delta_x_135_s2", "delta_x_126_s2", "vol3_x_135_s2",
  80  "gamma3f_x_vLR_lfun", "gamma3f_x_vLR0", "gamma3f_x_vL_lfun",
  81  "gamma3f_x_vL0", "gamma3f_x_v_lfun", "gamma3f_x_v0", "ldih_x_126_n",
  82  "ldih2_x_126_n", "ldih6_x_126_n", "ldih_x_135_n", "ldih3_x_135_n",
  83  "ldih5_x_135_n", "gamma3f_126_x_s_n", "gamma3f_135_x_s_n",
  84  "gamma3f_vLR_x_nlfun", "gamma3f_vLR_x_n0", "gamma3f_vL_x_nlfun",
  85  "gamma3f_vL_x_n0", "tau_lowform_x", "tau_residual_x",
  86  "mdtau_y_LC", "mdtau2uf_y_LC", "euler_3flat_x", "euler_2flat_x",
  87  "euler_1flat_x", "taum_3flat_x", "taum_2flat_x", "taum_1flat_x",
  88  "delta_pent_x", "ell_uvx", "ell_vx2", "selling_volume2",
  89  "selling_surface_nn", "selling_surface_nn2_013",
  90  "selling_surface_nn01_23", "selling_homog", "fcc_ineq", "taum_x1(&&)",
  91  "taum_x2(&&)", "taum_x1_x2(&)", "arclength_x1(&&)", "arclength_x2(&&)",
  92  "surfR126d(&)", "lindih(&)", "delta_126_x(&&&)", "delta_234_x(&&&)",
  93  "delta_135_x(&&&)", "taum_sub1_x(&)", "delta_sub1_x(&)",
  94  "taum_sub246_x(&&&)", "taum_sub345_x(&&&)"];;
  95
  96 *)
  97
  98 (*
  99 removed from parse_ineq.hl:
 100
 101 removed from autogen:
 102        surfR;surfRy;surfRdyc2;surfy;dih4_y;
 103
 104    (* deprecated: arclength_x_345; solRy;dihRy; *)
 105
 106 removed from macros:
 107    (* deprecated:
 108    delta_template_B_x_alt;
 109    taum_template_B_x_alt;
 110    dih_template_B_x_alt;
 111    dih_hexall_x;
 112    dih1_hexall_x;
 113    upper_dih_hexall_x;
 114    delta_hexall_x;
 115    delta4_hexall_x;
 116    taum_hexall_x;
 117    eulerA_hexall_x;
 118    factor345_hexall_x;
 119    law_cosines_234_x;
 120    law_cosines_126_x;
 121    tau_lowform_x_alt;
 122 *)
 123    upper_dih_y;
 124    gamma3f_135_n;gamma3f_126_n;gamma23f_n;gamma23f_126_03_n;
 125    taum_sub1_x;
 126    taum_sub246_x;
 127    taum_sub345_x;
 128    taum_3flat_x_alt;
 129    taum_2flat_x_alt;
 130    taum_1flat_x_alt;
 131    euler_3flat_x_alt;
 132    euler_2flat_x_alt;
 133    euler_1flat_x_alt;
 134    delta_pent_x;
 135    lmdih_x_div_sqrtdelta_posbranch;
 136    lmdih2_x_div_sqrtdelta_posbranch;
 137    lmdih3_x_div_sqrtdelta_posbranch;
 138    lmdih5_x_div_sqrtdelta_posbranch;
 139    lmdih6_x_div_sqrtdelta_posbranch;
 140    ell_vx2;
 141    upper_dih_x;
 142 *)
 143
 144 (* removed from optimize.hl:
 145
 146
 147 (* generate function defs for these. *)
 148 (*
 149 let idem_assoc = map (fun a -> (a,a)) [
 150   "delta_x4";"delta4_squared_x";"x1_delta_x";
 151   "halfbump_x1";"halfbump_x4";
 152   "dih_x_div_sqrtdelta_posbranch";"dih2_x_div_sqrtdelta_posbranch";
 153   "dih3_x_div_sqrtdelta_posbranch";"dih4_x_div_sqrtdelta_posbranch";
 154   "dih5_x_div_sqrtdelta_posbranch";"dih6_x_div_sqrtdelta_posbranch";
 155   "ldih_x_div_sqrtdelta_posbranch";"ldih2_x_div_sqrtdelta_posbranch";
 156   "ldih3_x_div_sqrtdelta_posbranch";"ldih4_x_div_sqrtdelta_posbranch";
 157   "ldih5_x_div_sqrtdelta_posbranch";"ldih6_x_div_sqrtdelta_posbranch";
 158   "dih_x_126_s2";  "dih2_x_126_s2";  "dih3_x_126_s2";
 159   "dih4_x_126_s2";  "dih5_x_126_s2";  "dih6_x_126_s2";
 160  "ldih_x_126_s2";  "ldih2_x_126_s2";  "ldih6_x_126_s2";
 161   "dih_x_135_s2";  "dih2_x_135_s2";  "dih3_x_135_s2";
 162   "dih4_x_135_s2";  "dih5_x_135_s2";  "dih6_x_135_s2";
 163  "ldih_x_135_s2";  "ldih3_x_135_s2";  "ldih5_x_135_s2";
 164   "delta_x_126_s2";  "delta_x_135_s2";
 165   "vol3_x_sqrt";"vol3_x_135_s2";
 166   "sol_euler_x_div_sqrtdelta";"sol_euler345_x_div_sqrtdelta";
 167   "sol_euler156_x_div_sqrtdelta";"sol_euler246_x_div_sqrtdelta";
 168   "taum_x1";"taum_x2";"taum_x1_x2";"arclength_x1";"arclength_x2";
 169   "arclength_x_123";"arclength_x_234";"arclength_x_126";
 170   (* "arclength_x_345"; *)
 171   "acs_sqrt_x1_d4";"acs_sqrt_x2_d4";
 172   "gchi2_x";"gchi3_x";"gchi4_x";"gchi5_x";"gchi6_x";
 173   "ldih_x";"ldih2_x";"ldih3_x";"ldih6_x";
 174   "vol3f_x_lfun";  "vol3f_x_sqrt2_lmplus";
 175   "gamma23f_126_w1";
 176   "gamma23f_red";
 177   "asn797k"; "asnFnhk"; "lfun_y1";"surf_x";"surfR126d";
 178     "sol";   "vol_x";   "gchi1_x";"eta2_126";"eta2_135";
 179   "gamma3f_x_vLR_lfun";  "gamma3f_x_vLR0";
 180   "gamma3f_x_vL_lfun";  "gamma3f_x_vL0";
 181   "gamma3f_x_v_lfun";  "gamma3f_x_v0";
 182   "monomial";
 183   "num1";
 184
 185   (* deprecated:
 186      "dih_template_B_x";"taum_template_B_x";"delta_template_B_x";
 187      "dih_hexall_x";"dih1_hexall_x";"upper_dih_hexall_x";
 188      "delta_hexall_x";"delta4_hexall_x";
 189      "eulerA_hexall_x";"factor345_hexall_x";
 190      "law_cosines_234_x";"law_cosines_126_x";
 191      "delta_top_x";
 192      "taum_hexall_x";
 193      "tau_lowform_x";
 194   *)
 195   "delta_126_x";"delta_234_x";"delta_135_x";
 196   "taum_x";
 197   "ldih_x_135_n";  "ldih3_x_135_n";  "ldih5_x_135_n";
 198   "ldih_x_126_n";    "ldih6_x_126_n";
 199   "gamma3f_vLR_x_nlfun";"gamma3f_vL_x_nlfun";
 200   "gamma3f_vLR_x_n0";"gamma3f_vL_x_n0";
 201   "gamma3f_135_x_s_n";"gamma3f_126_x_s_n";
 202   "eulerA_x";
 203   (* added may 2011 *)
 204   "tau_residual_x";
 205   "edge_flat_x";
 206   "taum_sub1_x";
 207   "delta_sub1_x";
 208   "delta_pent_x";
 209   "taum_sub246_x";
 210   "taum_sub345_x";
 211   "taum_3flat_x";
 212   "taum_2flat_x";
 213   "taum_1flat_x";
 214   "euler_3flat_x";
 215   "euler_2flat_x";
 216   "euler_1flat_x";
 217   (* 2D hex perimeter problem *)
 218   "ell_uvx";
 219   "ell_vx2";
 220   (* selling parameters for Phelan-Weaire workshop 2012 *)
 221   "selling_surface_nn";
 222   "selling_surface_nn2_013";
 223   "selling_surface_nn01_23";
 224   "selling_homog";
 225   "selling_volume2";
 226   "fcc_ineq";
 227  ];;
 228 *)
 229
 230 removed from cpp_assoc:
 231 (*
 232   ("norm2hh_x","norm2hhx");
 233   ("ldih2_x_126_n","ldih2_x_126_n"); (* was n_ in fst *)
 234   ("unit6","unit");
 235   ("proj_x1","x1");("proj_x2","x2");("proj_x3","x3");
 236   ("proj_x4","x4");("proj_x5","x5");("proj_x6","x6");
 237   ("sqrt_x1","y1");   ("sqrt_x2","y2");   ("sqrt_x3","y3");
 238   ("sqrt_x4","y4");   ("sqrt_x5","y5");   ("sqrt_x6","y6");
 239   ("dih_x","dih"); ("dih2_x","dih2");("dih3_x","dih3");
 240   ("dih4_x","dih4"); ("dih5_x","dih5");("dih6_x","dih6");
 241   ("rad2_x","rad2");
 242   ("delta_x","delta");
 243   ("rhazim_x","rhazim");("rhazim2_x","rhazim2");
 244   ("rhazim3_x","rhazim3");
 245   ("upper_dih_x","upper_dih");
 246 *)
 247
 248 *)
 249
 250
 251
 252 (* removed from optimize.hl
 253
 254
 255 removed from X_FROZEN_COMPOUND:
 256
 257 GSYM dih_x_126_s2); (GSYM dih2_x_126_s2);
 258  GSYM dih3_x_126_s2; GSYM dih4_x_126_s2;
 259  GSYM dih5_x_126_s2; GSYM dih6_x_126_s2;
 260  GSYM ldih_x_126_s2; GSYM ldih2_x_126_s2;GSYM ldih6_x_126_s2;
 261  (GSYM dih_x_135_s2); (GSYM dih2_x_135_s2);
 262  GSYM dih3_x_135_s2; GSYM dih4_x_135_s2;
 263  GSYM dih5_x_135_s2; GSYM dih6_x_135_s2;
 264  GSYM ldih_x_135_s2; GSYM ldih3_x_135_s2;GSYM ldih5_x_135_s2;
 265  GSYM delta_x_126_s2;GSYM delta_x_135_s2;
 266  GSYM vol3_x_135_s2;
 267  GSYM gamma3f_x_vLR_lfun;GSYM gamma3f_x_vLR0;
 268  GSYM gamma3f_x_v_lfun;GSYM gamma3f_x_v0;
 269  GSYM gamma3f_x_vL_lfun;GSYM gamma3f_x_vL0;
 270  GSYM gamma3f_vLR_x_nlfun;     GSYM gamma3f_vL_x_nlfun;
 271  GSYM gamma3f_vLR_x_n0;     GSYM gamma3f_vL_x_n0;
 272  GSYM gamma3f_135_x_s_n; GSYM gamma3f_126_x_s_n;
 273
 274  GSYM ldih_x_126_n;     GSYM ldih2_x_126_n;     GSYM ldih6_x_126_n;
 275  GSYM ldih_x_135_n;GSYM ldih3_x_135_n;GSYM ldih5_x_135_n;
 276
 277 removed from X_COMPOUND_DEF:
 278  GSYM Sphere.taum_x1_x2;GSYM Sphere.taum_x1;GSYM Sphere.taum_x2;
 279  GSYM Sphere.surf_x;
 280  GSYM Sphere.surfR126d;
 281
 282 removed from macro_expand:
 283      (* Oct 20: Sphere.vol3f; *)
 284      (* Sphere.pathL;Sphere.pathR;  --
 285         removed May 24, 2011. for ineqdata cases to work. *)
 286      gamma23f';gamma23f_126_03';gamma23f_v' ;
 287      gamma23f_n_alt;gamma23f_126_03_n_alt;
 288      gamma3f_135_n_alt;gamma3f_126_n_alt;
 289
 290 removed from BRANCH_TAC
 291 (* vol3f_palt; *)              gamma3f_126_expand;gamma3f_135_expand;
 292            gamma3f_vLR0_case;gamma3f_vLR_lfun_case;
 293            gamma3f_vL0_case;gamma3f_vL_lfun_case;
 294            gamma3f_v0_case;gamma3f_v_lfun_case;
 295            (* dec 29 *) gamma3f_vL_nlfun_case;gamma3f_vL_n0_case;
 296          gamma3f_vLR_n0_case;gamma3f_vLR_nlfun_case;
 297          lmdih_ldih_n;lmdih2_ldih2_n;lmdih3_ldih3_n;
 298          lmdih5_ldih5_n;lmdih6_ldih6_n;
 299          lmdih_n0;lmdih2_n0;lmdih3_n0;lmdih5_n0;lmdih6_n0;
 300
 301 removed from  X_SQRT_COMPOUND_ORDER :
 302 `upper_dih_y (sqrt x1) (sqrt x2) (sqrt x3) (sqrt x4) (sqrt x5) (sqrt x6) =
 303    upper_dih_x x1 x2 x3 x4 x5 x6 `;
 304
 305 removed from X_SQRT_COMPOUND_ORDER_TAC:
 306 upper_dih_x_y;
 307
 308
 309
 310 *)
 311
 312