WPBDC 2014.3.9 → 2015.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. checksums.yaml +8 -8
  2. data/ext/WPBDC/WPBDC.c +4 -1
  3. data/ext/WPBDC/bridge_random.c +8 -7
  4. data/ext/WPBDC/internal.h +8 -8
  5. data/ext/WPBDC/judge.c +12 -11
  6. data/ext/WPBDC/loading.c +1 -1
  7. data/ext/WPBDC/params.c +1 -1
  8. data/ext/WPBDC/rc4.h +1 -1
  9. data/ext/WPBDC/scenario_descriptors.h +372 -373
  10. data/ext/WPBDC/sketch.c +4 -5
  11. data/lib/WPBDC.rb +6 -1
  12. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NjE1ZGY5OTc0YmQwYTZiNmNkMjY4YjdmNTg5MDk1YThhYjI1YzRlMQ==
4
+ YjFmOWY1NzkyYjJjYzk5NWY5ZWI5YjdmODEwM2UwODRmYzc0ZjlkMA==
5
5
  data.tar.gz: !binary |-
6
- OWQ0MTQwMWI0NjViMTRjYmI2YzI5YzIxZWE0NGExNjc3NDkzZWI5MQ==
6
+ ZTljMjMxODQ4MTBkYTI4YzgzNWIzZmNhYmI0NzM1ZDJiNGY0MWZhNQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- OTFjN2RlMWUzZWRlNzk1NzQ1MTEzNGNmMmY0ZDNmMGNhZDcyNzM1ZTI5NDYy
10
- Yjk5NGUzZmZiOGViYjA4OGY5OGMyZTU5ZGY4OWQ3NzU1NDIyN2QwYjgyYWI2
11
- MzJiZTZiNGQyMmExODZiNTI0NzdhODQwNGVjZGVlZDQ0NThjNTE=
9
+ NjUzZTBlOTFlYTJiMTlhYjQzODIxN2MzMDRiMzFkZWI1ZWEzYWFmYjllZWYy
10
+ MzkxZDcwNmIyMGM1ZTE2MDNjNmRhZGE1ZTdiNjAwMDNhYWNhMjFkYjkzYTVl
11
+ NDlkNDFhOTBhMjQ4MGNjZTdjZTIxYmFhMWQwOWNmMDdjNmUzNTU=
12
12
  data.tar.gz: !binary |-
13
- Y2ZiNWY4NDc4M2JkNGM1OTk5ODU1ZDU0ZGJjYmZkYjI0MzhlNTdlYjhkZDY4
14
- ODg4ZmYyZjkxYmQ4MDA5ZTNkZjJlNmYzNjc4ZWYwZmExNjExYmQ1OGZiMGFj
15
- MjFmMzYwMDE1OWVkOTQ1NDFmYjU3NWI0Yjc1NTRiNDBkOTJhZGM=
13
+ ODAzZjRiNGIyYjkwOTViY2Y1OTU0NTRjN2Y5ZWY0ODQyZDgwYTE0NzgxYWY4
14
+ N2MwMDE4ZTRhZTZkYTU4MjcwOWUzOWY2ODE2ZjI4OWQ5YzZhZGQ3Y2E5NmY4
15
+ YWYyOGNjODkzYmU4MzRkMjY2ZmUwOWQ5MDFjZDcyODQxMmNkYWY=
data/ext/WPBDC/WPBDC.c CHANGED
@@ -195,11 +195,14 @@ static struct ft_entry {
195
195
 
196
196
  #define INT_CONST_TABLE_ENTRY(Name) { #Name, Name }
197
197
 
198
+ // Decouple judge's published contest year from system-wide constant.
199
+ #define JUDGE_CONTEST_YEAR CONTEST_YEAR
200
+
198
201
  static struct ict_entry {
199
202
  char *name;
200
203
  int val;
201
204
  } int_const_table[] = {
202
- INT_CONST_TABLE_ENTRY(CONTEST_YEAR),
205
+ INT_CONST_TABLE_ENTRY(JUDGE_CONTEST_YEAR),
203
206
  INT_CONST_TABLE_ENTRY(BRIDGE_OK),
204
207
  INT_CONST_TABLE_ENTRY(BRIDGE_MALFORMED),
205
208
  INT_CONST_TABLE_ENTRY(BRIDGE_WRONGVERSION),
data/ext/WPBDC/bridge_random.c CHANGED
@@ -191,7 +191,7 @@ int induce_failure(TBridge *dst, TBridge *src, unsigned seed)
191
191
 
192
192
  #define NEXT(I) ((((I) - 1 + 1) % dst->n_members) + 1)
193
193
 
194
- for (member_index = NEXT(start_member_index);
194
+ for (member_index = NEXT(start_member_index);
195
195
  member_index != start_member_index;
196
196
  member_index = NEXT(member_index)) {
197
197
 
@@ -203,14 +203,15 @@ int induce_failure(TBridge *dst, TBridge *src, unsigned seed)
203
203
  new_size = --dst->members[member_index].x_section.size;
204
204
  setup_analysis(analysis, dst, 0, 0, 0);
205
205
 
206
- // Check for analysis problems.
207
- if (analysis->error != NoAnalError)
208
- return -2;
206
+ // Punt for this member on slenderness failure.
207
+ if (analysis->error != NoAnalError) {
208
+ break;
209
+ }
209
210
 
210
211
  // Check for failure and return if we've done it!
211
- if (analysis->n_compressive_failures > 0 ||
212
- analysis->n_tensile_failures > 0)
212
+ if (analysis->n_compressive_failures > 0 || analysis->n_tensile_failures > 0) {
213
213
  return 0;
214
+ }
214
215
  } while (new_size > 0);
215
216
  // Couldn't do it with this member.
216
217
  // Restore and loop to try the next member.
@@ -219,7 +220,7 @@ int induce_failure(TBridge *dst, TBridge *src, unsigned seed)
219
220
  }
220
221
  #undef NEXT
221
222
  // Very very unlikely, but who knows?
222
- return -3;
223
+ return -1;
223
224
  }
224
225
 
225
226
  // Make a randomized variant of the source bridge. This is just
data/ext/WPBDC/internal.h CHANGED
@@ -283,8 +283,8 @@ typedef struct params_t {
283
283
  { /* [1] */ \
284
284
  "Case B (Heavy Deck, Heavy Truck)", \
285
285
  DEAD_LOAD_FACTOR * 120.265 + 33.097, /* TFloat point_dead_load; */ \
286
- 120, /* TFloat front_axle_load; */ \
287
- 120, /* TFloat rear_axle_load; */ \
286
+ 124, /* TFloat front_axle_load; */ \
287
+ 124, /* TFloat rear_axle_load; */ \
288
288
  }, \
289
289
  { /* [2] */ \
290
290
  "Case C (Light Deck, Light Truck)", \
@@ -295,8 +295,8 @@ typedef struct params_t {
295
295
  { /* [3] */ \
296
296
  "Case D (Light Deck, Heavy Truck)", \
297
297
  DEAD_LOAD_FACTOR * 82.608 + 33.097, /* TFloat point_dead_load; */ \
298
- 120, /* TFloat front_axle_load; */ \
299
- 120, /* TFloat rear_axle_load; */ \
298
+ 124, /* TFloat front_axle_load; */ \
299
+ 124, /* TFloat rear_axle_load; */ \
300
300
  }, \
301
301
  }, \
302
302
  500, /* TFloat connection_cost; */ \
@@ -309,7 +309,7 @@ typedef struct params_t {
309
309
  250000, /* TFloat Fy; */ \
310
310
  7850, /* TFloat density; */ \
311
311
  { /* TFloat cost[NSections]; */ \
312
- 4.50, /* Bar */ \
312
+ 4.30, /* Bar */ \
313
313
  6.30, /* Tube */ \
314
314
  } \
315
315
  }, \
@@ -320,7 +320,7 @@ typedef struct params_t {
320
320
  345000, /* TFloat Fy; */ \
321
321
  7850, /* TFloat density; */ \
322
322
  { /* TFloat cost[NSections]; */ \
323
- 5.00, /* Bar */ \
323
+ 5.60, /* Bar */ \
324
324
  7.00, /* Tube */ \
325
325
  } \
326
326
  }, \
@@ -331,8 +331,8 @@ typedef struct params_t {
331
331
  485000, /* TFloat Fy; */ \
332
332
  7850, /* TFloat density; */ \
333
333
  { /* TFloat cost[NSections]; */ \
334
- 5.55, /* Bar */ \
335
- 7.75, /* Tube */ \
334
+ 6.00, /* Bar */ \
335
+ 7.70, /* Tube */ \
336
336
  } \
337
337
  }, \
338
338
  } \
data/ext/WPBDC/judge.c CHANGED
@@ -109,13 +109,11 @@ char *failed_variant(STRING *bridge_as_string, int seed)
109
109
 
110
110
  parse_bridge(bridge, bridge_as_string);
111
111
 
112
- if (bridge->error == BridgeNoError) {
113
- induce_failure(variant_bridge, bridge, seed);
112
+ rtn = 0;
113
+ if (bridge->error == BridgeNoError
114
+ && induce_failure(variant_bridge, bridge, seed) == 0) {
114
115
  rtn = unparse_bridge(variant_bridge);
115
116
  }
116
- else {
117
- rtn = 0;
118
- }
119
117
  clear_bridge(bridge);
120
118
  clear_bridge(variant_bridge);
121
119
 
@@ -223,14 +221,14 @@ char *analysis_log(STRING *bridge_as_string)
223
221
 
224
222
  #if defined(NATIVE_TEST) && !defined(CPROTO)
225
223
 
226
- //#define WRITE_EXAMPLES
224
+ #define WRITE_EXAMPLES
227
225
 
228
226
  #ifdef WRITE_EXAMPLES
229
- #define PREVIOUS_YEAR_DELTA 2
230
- #define EG_DIR "../../test/eg/2012"
231
- #define NEW_EG_DIR "../../test/eg/2014"
232
- #else
227
+ #define PREVIOUS_YEAR_DELTA 1
233
228
  #define EG_DIR "../../test/eg/2014"
229
+ #define NEW_EG_DIR "../../test/eg/2015"
230
+ #else
231
+ #define EG_DIR "../../test/eg/2015"
234
232
  #endif
235
233
 
236
234
  #ifdef WINDOWS
@@ -453,9 +451,9 @@ int main(int argc, char* argv[])
453
451
  }
454
452
 
455
453
  // Write a failed version of this bridge for future testing.
456
- printf("writing failed version\n");
457
454
  sprintf(fname, NEW_EG_DIR "/" "%s-failed%s", name, ext);
458
455
  if (stat(fname, stat_buf) != 0 && induce_failure(copy, bridge, 0) == 0) {
456
+ printf("writing failed version\n");
459
457
  text = unparse_bridge(copy);
460
458
  copy_str->ptr = text;
461
459
  copy_str->size = strlen(text);
@@ -470,6 +468,9 @@ int main(int argc, char* argv[])
470
468
  clear_bridge(copy);
471
469
  n_examples_written++;
472
470
  }
471
+ else {
472
+ printf("attempt to write broken bridge %s failed (either already exists or could not break)\n", fname);
473
+ }
473
474
  }
474
475
  continue;
475
476
  #endif
data/ext/WPBDC/loading.c CHANGED
@@ -118,7 +118,7 @@ void setup_loading(TLoading *loading,
118
118
  load_instance->point_load[2 * joint_index]);
119
119
  }
120
120
  }
121
- #endif;
121
+ #endif
122
122
 
123
123
  if (geometry == local_geometry)
124
124
  clear_geometry(geometry);
data/ext/WPBDC/params.c CHANGED
@@ -29,7 +29,7 @@ typedef struct params_t {
29
29
 
30
30
  */
31
31
 
32
- #define DEAD_LOAD_FACTOR 1.25
32
+ #define DEAD_LOAD_FACTOR 1.35
33
33
 
34
34
  // Constant part of the analysis parameters block. Rest has to be calculated.
35
35
  // This is similar to the BD_VERSION==0x400, but the cost factors have changed.
data/ext/WPBDC/rc4.h CHANGED
@@ -16,4 +16,4 @@ void clear_rc4(TRC4State *state);
16
16
  void setup_rc4(TRC4State *state, char *key, int keylen);
17
17
  unsigned endecrypt_rc4(unsigned char *buf, unsigned len, TRC4State *state);
18
18
 
19
- #endif
19
+ #endif
data/ext/WPBDC/scenario_descriptors.h CHANGED
@@ -1,395 +1,394 @@
1
1
  static TScenarioDescriptor scenario_descriptor_tbl[] = {
2
- { 0, "1050824100", "27A", 91200.00 },
3
- { 1, "1051220100", "32A", 92000.00 },
4
- { 2, "1051616100", "36A", 99900.00 },
5
- { 3, "1052012100", "39A", 106500.00 },
6
- { 4, "1052408100", "41A", 113900.00 },
7
- { 5, "1052804100", "42A", 124500.00 },
8
- { 6, "1053200000", "07A", 131500.00 },
9
- { 7, "1053200031", "70A", 147000.00 },
10
- { 8, "1053200200", "14A", 137500.00 },
11
- { 9, "1053200300", "21A", 143500.00 },
12
- { 10, "1053200331", "98A", 159000.00 },
13
- { 11, "1060820100", "26A", 85300.00 },
14
- { 12, "1061216100", "31A", 89200.00 },
15
- { 13, "1061612100", "35A", 98800.00 },
16
- { 14, "1062008100", "38A", 105200.00 },
17
- { 15, "1062404100", "40A", 114800.00 },
18
- { 16, "1062804000", "06A", 121700.00 },
19
- { 17, "1062804040", "68A", 136700.00 },
20
- { 18, "1062804041", "69A", 139500.00 },
21
- { 19, "1062804200", "13A", 127700.00 },
22
- { 20, "1062804300", "20A", 133700.00 },
23
- { 21, "1062804340", "96A", 148700.00 },
24
- { 22, "1062804341", "97A", 151500.00 },
25
- { 23, "1070816100", "25A", 82500.00 },
26
- { 24, "1071212100", "30A", 88100.00 },
27
- { 25, "1071608100", "34A", 97500.00 },
28
- { 26, "1072004100", "37A", 106100.00 },
29
- { 27, "1072404040", "66A", 131200.00 },
30
- { 28, "1072404340", "94A", 143200.00 },
31
- { 29, "1072408000", "05A", 108900.00 },
32
- { 30, "1072408040", "65A", 128400.00 },
33
- { 31, "1072408041", "67A", 134000.00 },
34
- { 32, "1072408200", "12A", 114900.00 },
35
- { 33, "1072408300", "19A", 120900.00 },
36
- { 34, "1072408340", "93A", 140400.00 },
37
- { 35, "1072408341", "95A", 146000.00 },
38
- { 36, "1080812100", "24A", 81400.00 },
39
- { 37, "1081208100", "29A", 86800.00 },
40
- { 38, "1081604100", "33A", 98400.00 },
41
- { 39, "1082004050", "63A", 121700.00 },
42
- { 40, "1082004350", "91A", 133700.00 },
43
- { 41, "1082008050", "62A", 118900.00 },
44
- { 42, "1082008350", "90A", 130900.00 },
45
- { 43, "1082012000", "04A", 97100.00 },
46
- { 44, "1082012050", "61A", 116100.00 },
47
- { 45, "1082012051", "64A", 124500.00 },
48
- { 46, "1082012200", "11A", 103100.00 },
49
- { 47, "1082012300", "18A", 109100.00 },
50
- { 48, "1082012350", "89A", 128100.00 },
51
- { 49, "1082012351", "92A", 136500.00 },
52
- { 50, "1090808100", "23A", 80100.00 },
53
- { 51, "1091204100", "28A", 87700.00 },
54
- { 52, "1091604050", "59A", 118200.00 },
55
- { 53, "1091604350", "87A", 130200.00 },
56
- { 54, "1091608050", "58A", 115400.00 },
57
- { 55, "1091608350", "86A", 127400.00 },
58
- { 56, "1091612050", "57A", 112600.00 },
59
- { 57, "1091612350", "85A", 124600.00 },
60
- { 58, "1091616000", "03A", 86300.00 },
61
- { 59, "1091616050", "56A", 109800.00 },
62
- { 60, "1091616051", "60A", 121000.00 },
63
- { 61, "1091616200", "10A", 92300.00 },
64
- { 62, "1091616300", "17A", 98300.00 },
65
- { 63, "1091616350", "84A", 121800.00 },
66
- { 64, "1091616351", "88A", 133000.00 },
67
- { 65, "1100804100", "22A", 81000.00 },
68
- { 66, "1101204060", "54A", 106700.00 },
69
- { 67, "1101204360", "82A", 118700.00 },
70
- { 68, "1101208060", "53A", 103900.00 },
71
- { 69, "1101208360", "81A", 115900.00 },
72
- { 70, "1101212060", "52A", 101100.00 },
73
- { 71, "1101212360", "80A", 113100.00 },
74
- { 72, "1101216060", "51A", 98300.00 },
75
- { 73, "1101216360", "79A", 110300.00 },
76
- { 74, "1101220000", "02A", 72500.00 },
77
- { 75, "1101220060", "50A", 95500.00 },
78
- { 76, "1101220061", "55A", 109500.00 },
79
- { 77, "1101220200", "09A", 78500.00 },
80
- { 78, "1101220300", "16A", 84500.00 },
81
- { 79, "1101220360", "78A", 107500.00 },
82
- { 80, "1101220361", "83A", 121500.00 },
83
- { 81, "1110804060", "48A", 104200.00 },
84
- { 82, "1110804360", "76A", 116200.00 },
85
- { 83, "1110808060", "47A", 101400.00 },
86
- { 84, "1110808360", "75A", 113400.00 },
87
- { 85, "1110812060", "46A", 98600.00 },
88
- { 86, "1110812360", "74A", 110600.00 },
89
- { 87, "1110816060", "45A", 95800.00 },
90
- { 88, "1110816360", "73A", 107800.00 },
91
- { 89, "1110820060", "44A", 93000.00 },
92
- { 90, "1110820360", "72A", 105000.00 },
2
+ { 0, "1050824100", "27A", 89700.00 },
3
+ { 1, "1051220100", "32A", 95400.00 },
4
+ { 2, "1051616100", "36A", 101900.00 },
5
+ { 3, "1052012100", "39A", 110400.00 },
6
+ { 4, "1052408100", "41A", 119800.00 },
7
+ { 5, "1052804100", "42A", 127200.00 },
8
+ { 6, "1053200000", "07A", 134000.00 },
9
+ { 7, "1053200031", "70A", 146500.00 },
10
+ { 8, "1053200200", "14A", 137000.00 },
11
+ { 9, "1053200300", "21A", 140000.00 },
12
+ { 10, "1053200331", "98A", 152500.00 },
13
+ { 11, "1060820100", "26A", 83500.00 },
14
+ { 12, "1061216100", "31A", 93700.00 },
15
+ { 13, "1061612100", "35A", 100900.00 },
16
+ { 14, "1062008100", "38A", 112900.00 },
17
+ { 15, "1062404100", "40A", 116700.00 },
18
+ { 16, "1062804000", "06A", 123700.00 },
19
+ { 17, "1062804040", "68A", 135700.00 },
20
+ { 18, "1062804041", "69A", 138500.00 },
21
+ { 19, "1062804200", "13A", 126700.00 },
22
+ { 20, "1062804300", "20A", 129700.00 },
23
+ { 21, "1062804340", "96A", 141700.00 },
24
+ { 22, "1062804341", "97A", 144500.00 },
25
+ { 23, "1070816100", "25A", 81800.00 },
26
+ { 24, "1071212100", "30A", 92700.00 },
27
+ { 25, "1071608100", "34A", 103400.00 },
28
+ { 26, "1072004100", "37A", 109800.00 },
29
+ { 27, "1072404040", "66A", 129700.00 },
30
+ { 28, "1072404340", "94A", 135700.00 },
31
+ { 29, "1072408000", "05A", 110400.00 },
32
+ { 30, "1072408040", "65A", 126900.00 },
33
+ { 31, "1072408041", "67A", 132500.00 },
34
+ { 32, "1072408200", "12A", 113400.00 },
35
+ { 33, "1072408300", "19A", 116400.00 },
36
+ { 34, "1072408340", "93A", 132900.00 },
37
+ { 35, "1072408341", "95A", 138500.00 },
38
+ { 36, "1080812100", "24A", 80800.00 },
39
+ { 37, "1081208100", "29A", 95200.00 },
40
+ { 38, "1081604100", "33A", 100300.00 },
41
+ { 39, "1082004050", "63A", 122300.00 },
42
+ { 40, "1082004350", "91A", 128300.00 },
43
+ { 41, "1082008050", "62A", 119500.00 },
44
+ { 42, "1082008350", "90A", 125500.00 },
45
+ { 43, "1082012000", "04A", 100700.00 },
46
+ { 44, "1082012050", "61A", 116700.00 },
47
+ { 45, "1082012051", "64A", 125100.00 },
48
+ { 46, "1082012200", "11A", 103700.00 },
49
+ { 47, "1082012300", "18A", 106700.00 },
50
+ { 48, "1082012350", "89A", 122700.00 },
51
+ { 49, "1082012351", "92A", 131100.00 },
52
+ { 50, "1090808100", "23A", 83300.00 },
53
+ { 51, "1091204100", "28A", 92100.00 },
54
+ { 52, "1091604050", "59A", 117300.00 },
55
+ { 53, "1091604350", "87A", 123300.00 },
56
+ { 54, "1091608050", "58A", 114500.00 },
57
+ { 55, "1091608350", "86A", 120500.00 },
58
+ { 56, "1091612050", "57A", 111700.00 },
59
+ { 57, "1091612350", "85A", 117700.00 },
60
+ { 58, "1091616000", "03A", 88400.00 },
61
+ { 59, "1091616050", "56A", 108900.00 },
62
+ { 60, "1091616051", "60A", 120100.00 },
63
+ { 61, "1091616200", "10A", 91400.00 },
64
+ { 62, "1091616300", "17A", 94400.00 },
65
+ { 63, "1091616350", "84A", 114900.00 },
66
+ { 64, "1091616351", "88A", 126100.00 },
67
+ { 65, "1100804100", "22A", 80200.00 },
68
+ { 66, "1101204060", "54A", 108600.00 },
69
+ { 67, "1101204360", "82A", 114600.00 },
70
+ { 68, "1101208060", "53A", 105800.00 },
71
+ { 69, "1101208360", "81A", 111800.00 },
72
+ { 70, "1101212060", "52A", 103000.00 },
73
+ { 71, "1101212360", "80A", 109000.00 },
74
+ { 72, "1101216060", "51A", 100200.00 },
75
+ { 73, "1101216360", "79A", 106200.00 },
76
+ { 74, "1101220000", "02A", 77400.00 },
77
+ { 75, "1101220060", "50A", 97400.00 },
78
+ { 76, "1101220061", "55A", 111400.00 },
79
+ { 77, "1101220200", "09A", 80400.00 },
80
+ { 78, "1101220300", "16A", 83400.00 },
81
+ { 79, "1101220360", "78A", 103400.00 },
82
+ { 80, "1101220361", "83A", 117400.00 },
83
+ { 81, "1110804060", "48A", 101200.00 },
84
+ { 82, "1110804360", "76A", 107200.00 },
85
+ { 83, "1110808060", "47A", 98400.00 },
86
+ { 84, "1110808360", "75A", 104400.00 },
87
+ { 85, "1110812060", "46A", 95600.00 },
88
+ { 86, "1110812360", "74A", 101600.00 },
89
+ { 87, "1110816060", "45A", 92800.00 },
90
+ { 88, "1110816360", "73A", 98800.00 },
91
+ { 89, "1110820060", "44A", 90000.00 },
92
+ { 90, "1110820360", "72A", 96000.00 },
93
93
  { 91, "1110824000", "01A", 62700.00 },
94
- { 92, "1110824060", "43A", 90200.00 },
95
- { 93, "1110824061", "49A", 107000.00 },
96
- { 94, "1110824200", "08A", 68700.00 },
97
- { 95, "1110824300", "15A", 74700.00 },
98
- { 96, "1110824360", "71A", 102200.00 },
99
- { 97, "1110824361", "77A", 119000.00 },
100
- { 98, "2050824100", "27B", 91200.00 },
101
- { 99, "2051220100", "32B", 92000.00 },
102
- { 100, "2051616100", "36B", 99900.00 },
103
- { 101, "2052012100", "39B", 106500.00 },
104
- { 102, "2052408100", "41B", 113900.00 },
105
- { 103, "2052804100", "42B", 124500.00 },
106
- { 104, "2053200000", "07B", 131500.00 },
107
- { 105, "2053200031", "70B", 147000.00 },
108
- { 106, "2053200200", "14B", 137500.00 },
109
- { 107, "2053200300", "21B", 143500.00 },
110
- { 108, "2053200331", "98B", 159000.00 },
111
- { 109, "2060820100", "26B", 85300.00 },
112
- { 110, "2061216100", "31B", 89200.00 },
113
- { 111, "2061612100", "35B", 98800.00 },
114
- { 112, "2062008100", "38B", 105200.00 },
115
- { 113, "2062404100", "40B", 114800.00 },
116
- { 114, "2062804000", "06B", 121700.00 },
117
- { 115, "2062804040", "68B", 136700.00 },
118
- { 116, "2062804041", "69B", 139500.00 },
119
- { 117, "2062804200", "13B", 127700.00 },
120
- { 118, "2062804300", "20B", 133700.00 },
121
- { 119, "2062804340", "96B", 148700.00 },
122
- { 120, "2062804341", "97B", 151500.00 },
123
- { 121, "2070816100", "25B", 82500.00 },
124
- { 122, "2071212100", "30B", 88100.00 },
125
- { 123, "2071608100", "34B", 97500.00 },
126
- { 124, "2072004100", "37B", 106100.00 },
127
- { 125, "2072404040", "66B", 131200.00 },
128
- { 126, "2072404340", "94B", 143200.00 },
129
- { 127, "2072408000", "05B", 108900.00 },
130
- { 128, "2072408040", "65B", 128400.00 },
131
- { 129, "2072408041", "67B", 134000.00 },
132
- { 130, "2072408200", "12B", 114900.00 },
133
- { 131, "2072408300", "19B", 120900.00 },
134
- { 132, "2072408340", "93B", 140400.00 },
135
- { 133, "2072408341", "95B", 146000.00 },
136
- { 134, "2080812100", "24B", 81400.00 },
137
- { 135, "2081208100", "29B", 86800.00 },
138
- { 136, "2081604100", "33B", 98400.00 },
139
- { 137, "2082004050", "63B", 121700.00 },
140
- { 138, "2082004350", "91B", 133700.00 },
141
- { 139, "2082008050", "62B", 118900.00 },
142
- { 140, "2082008350", "90B", 130900.00 },
143
- { 141, "2082012000", "04B", 97100.00 },
144
- { 142, "2082012050", "61B", 116100.00 },
145
- { 143, "2082012051", "64B", 124500.00 },
146
- { 144, "2082012200", "11B", 103100.00 },
147
- { 145, "2082012300", "18B", 109100.00 },
148
- { 146, "2082012350", "89B", 128100.00 },
149
- { 147, "2082012351", "92B", 136500.00 },
150
- { 148, "2090808100", "23B", 80100.00 },
151
- { 149, "2091204100", "28B", 87700.00 },
152
- { 150, "2091604050", "59B", 118200.00 },
153
- { 151, "2091604350", "87B", 130200.00 },
154
- { 152, "2091608050", "58B", 115400.00 },
155
- { 153, "2091608350", "86B", 127400.00 },
156
- { 154, "2091612050", "57B", 112600.00 },
157
- { 155, "2091612350", "85B", 124600.00 },
158
- { 156, "2091616000", "03B", 86300.00 },
159
- { 157, "2091616050", "56B", 109800.00 },
160
- { 158, "2091616051", "60B", 121000.00 },
161
- { 159, "2091616200", "10B", 92300.00 },
162
- { 160, "2091616300", "17B", 98300.00 },
163
- { 161, "2091616350", "84B", 121800.00 },
164
- { 162, "2091616351", "88B", 133000.00 },
165
- { 163, "2100804100", "22B", 81000.00 },
166
- { 164, "2101204060", "54B", 106700.00 },
167
- { 165, "2101204360", "82B", 118700.00 },
168
- { 166, "2101208060", "53B", 103900.00 },
169
- { 167, "2101208360", "81B", 115900.00 },
170
- { 168, "2101212060", "52B", 101100.00 },
171
- { 169, "2101212360", "80B", 113100.00 },
172
- { 170, "2101216060", "51B", 98300.00 },
173
- { 171, "2101216360", "79B", 110300.00 },
174
- { 172, "2101220000", "02B", 72500.00 },
175
- { 173, "2101220060", "50B", 95500.00 },
176
- { 174, "2101220061", "55B", 109500.00 },
177
- { 175, "2101220200", "09B", 78500.00 },
178
- { 176, "2101220300", "16B", 84500.00 },
179
- { 177, "2101220360", "78B", 107500.00 },
180
- { 178, "2101220361", "83B", 121500.00 },
181
- { 179, "2110804060", "48B", 104200.00 },
182
- { 180, "2110804360", "76B", 116200.00 },
183
- { 181, "2110808060", "47B", 101400.00 },
184
- { 182, "2110808360", "75B", 113400.00 },
185
- { 183, "2110812060", "46B", 98600.00 },
186
- { 184, "2110812360", "74B", 110600.00 },
187
- { 185, "2110816060", "45B", 95800.00 },
188
- { 186, "2110816360", "73B", 107800.00 },
189
- { 187, "2110820060", "44B", 93000.00 },
190
- { 188, "2110820360", "72B", 105000.00 },
94
+ { 92, "1110824060", "43A", 87200.00 },
95
+ { 93, "1110824061", "49A", 104000.00 },
96
+ { 94, "1110824200", "08A", 65700.00 },
97
+ { 95, "1110824300", "15A", 68700.00 },
98
+ { 96, "1110824360", "71A", 93200.00 },
99
+ { 97, "1110824361", "77A", 110000.00 },
100
+ { 98, "2050824100", "27B", 89700.00 },
101
+ { 99, "2051220100", "32B", 95400.00 },
102
+ { 100, "2051616100", "36B", 101900.00 },
103
+ { 101, "2052012100", "39B", 110400.00 },
104
+ { 102, "2052408100", "41B", 119800.00 },
105
+ { 103, "2052804100", "42B", 127200.00 },
106
+ { 104, "2053200000", "07B", 134000.00 },
107
+ { 105, "2053200031", "70B", 146500.00 },
108
+ { 106, "2053200200", "14B", 137000.00 },
109
+ { 107, "2053200300", "21B", 140000.00 },
110
+ { 108, "2053200331", "98B", 152500.00 },
111
+ { 109, "2060820100", "26B", 83500.00 },
112
+ { 110, "2061216100", "31B", 93700.00 },
113
+ { 111, "2061612100", "35B", 100900.00 },
114
+ { 112, "2062008100", "38B", 112900.00 },
115
+ { 113, "2062404100", "40B", 116700.00 },
116
+ { 114, "2062804000", "06B", 123700.00 },
117
+ { 115, "2062804040", "68B", 135700.00 },
118
+ { 116, "2062804041", "69B", 138500.00 },
119
+ { 117, "2062804200", "13B", 126700.00 },
120
+ { 118, "2062804300", "20B", 129700.00 },
121
+ { 119, "2062804340", "96B", 141700.00 },
122
+ { 120, "2062804341", "97B", 144500.00 },
123
+ { 121, "2070816100", "25B", 81800.00 },
124
+ { 122, "2071212100", "30B", 92700.00 },
125
+ { 123, "2071608100", "34B", 103400.00 },
126
+ { 124, "2072004100", "37B", 109800.00 },
127
+ { 125, "2072404040", "66B", 129700.00 },
128
+ { 126, "2072404340", "94B", 135700.00 },
129
+ { 127, "2072408000", "05B", 110400.00 },
130
+ { 128, "2072408040", "65B", 126900.00 },
131
+ { 129, "2072408041", "67B", 132500.00 },
132
+ { 130, "2072408200", "12B", 113400.00 },
133
+ { 131, "2072408300", "19B", 116400.00 },
134
+ { 132, "2072408340", "93B", 132900.00 },
135
+ { 133, "2072408341", "95B", 138500.00 },
136
+ { 134, "2080812100", "24B", 80800.00 },
137
+ { 135, "2081208100", "29B", 95200.00 },
138
+ { 136, "2081604100", "33B", 100300.00 },
139
+ { 137, "2082004050", "63B", 122300.00 },
140
+ { 138, "2082004350", "91B", 128300.00 },
141
+ { 139, "2082008050", "62B", 119500.00 },
142
+ { 140, "2082008350", "90B", 125500.00 },
143
+ { 141, "2082012000", "04B", 100700.00 },
144
+ { 142, "2082012050", "61B", 116700.00 },
145
+ { 143, "2082012051", "64B", 125100.00 },
146
+ { 144, "2082012200", "11B", 103700.00 },
147
+ { 145, "2082012300", "18B", 106700.00 },
148
+ { 146, "2082012350", "89B", 122700.00 },
149
+ { 147, "2082012351", "92B", 131100.00 },
150
+ { 148, "2090808100", "23B", 83300.00 },
151
+ { 149, "2091204100", "28B", 92100.00 },
152
+ { 150, "2091604050", "59B", 117300.00 },
153
+ { 151, "2091604350", "87B", 123300.00 },
154
+ { 152, "2091608050", "58B", 114500.00 },
155
+ { 153, "2091608350", "86B", 120500.00 },
156
+ { 154, "2091612050", "57B", 111700.00 },
157
+ { 155, "2091612350", "85B", 117700.00 },
158
+ { 156, "2091616000", "03B", 88400.00 },
159
+ { 157, "2091616050", "56B", 108900.00 },
160
+ { 158, "2091616051", "60B", 120100.00 },
161
+ { 159, "2091616200", "10B", 91400.00 },
162
+ { 160, "2091616300", "17B", 94400.00 },
163
+ { 161, "2091616350", "84B", 114900.00 },
164
+ { 162, "2091616351", "88B", 126100.00 },
165
+ { 163, "2100804100", "22B", 80200.00 },
166
+ { 164, "2101204060", "54B", 108600.00 },
167
+ { 165, "2101204360", "82B", 114600.00 },
168
+ { 166, "2101208060", "53B", 105800.00 },
169
+ { 167, "2101208360", "81B", 111800.00 },
170
+ { 168, "2101212060", "52B", 103000.00 },
171
+ { 169, "2101212360", "80B", 109000.00 },
172
+ { 170, "2101216060", "51B", 100200.00 },
173
+ { 171, "2101216360", "79B", 106200.00 },
174
+ { 172, "2101220000", "02B", 77400.00 },
175
+ { 173, "2101220060", "50B", 97400.00 },
176
+ { 174, "2101220061", "55B", 111400.00 },
177
+ { 175, "2101220200", "09B", 80400.00 },
178
+ { 176, "2101220300", "16B", 83400.00 },
179
+ { 177, "2101220360", "78B", 103400.00 },
180
+ { 178, "2101220361", "83B", 117400.00 },
181
+ { 179, "2110804060", "48B", 101200.00 },
182
+ { 180, "2110804360", "76B", 107200.00 },
183
+ { 181, "2110808060", "47B", 98400.00 },
184
+ { 182, "2110808360", "75B", 104400.00 },
185
+ { 183, "2110812060", "46B", 95600.00 },
186
+ { 184, "2110812360", "74B", 101600.00 },
187
+ { 185, "2110816060", "45B", 92800.00 },
188
+ { 186, "2110816360", "73B", 98800.00 },
189
+ { 187, "2110820060", "44B", 90000.00 },
190
+ { 188, "2110820360", "72B", 96000.00 },
191
191
  { 189, "2110824000", "01B", 62700.00 },
192
- { 190, "2110824060", "43B", 90200.00 },
193
- { 191, "2110824061", "49B", 107000.00 },
194
- { 192, "2110824200", "08B", 68700.00 },
195
- { 193, "2110824300", "15B", 74700.00 },
196
- { 194, "2110824360", "71B", 102200.00 },
197
- { 195, "2110824361", "77B", 119000.00 },
198
- { 196, "3050824100", "27C", 92700.00 },
199
- { 197, "3051220100", "32C", 93500.00 },
200
- { 198, "3051616100", "36C", 101400.00 },
201
- { 199, "3052012100", "39C", 108000.00 },
202
- { 200, "3052408100", "41C", 115400.00 },
203
- { 201, "3052804100", "42C", 126000.00 },
204
- { 202, "3053200000", "07C", 133000.00 },
192
+ { 190, "2110824060", "43B", 87200.00 },
193
+ { 191, "2110824061", "49B", 104000.00 },
194
+ { 192, "2110824200", "08B", 65700.00 },
195
+ { 193, "2110824300", "15B", 68700.00 },
196
+ { 194, "2110824360", "71B", 93200.00 },
197
+ { 195, "2110824361", "77B", 110000.00 },
198
+ { 196, "3050824100", "27C", 91700.00 },
199
+ { 197, "3051220100", "32C", 97400.00 },
200
+ { 198, "3051616100", "36C", 103900.00 },
201
+ { 199, "3052012100", "39C", 112400.00 },
202
+ { 200, "3052408100", "41C", 121800.00 },
203
+ { 201, "3052804100", "42C", 129200.00 },
204
+ { 202, "3053200000", "07C", 136000.00 },
205
205
  { 203, "3053200031", "70C", 148500.00 },
206
206
  { 204, "3053200200", "14C", 139000.00 },
207
- { 205, "3053200300", "21C", 145000.00 },
208
- { 206, "3053200331", "98C", 160500.00 },
209
- { 207, "3060820100", "26C", 87100.00 },
210
- { 208, "3061216100", "31C", 91000.00 },
211
- { 209, "3061612100", "35C", 100600.00 },
212
- { 210, "3062008100", "38C", 107000.00 },
213
- { 211, "3062404100", "40C", 116600.00 },
214
- { 212, "3062804000", "06C", 123500.00 },
215
- { 213, "3062804040", "68C", 138500.00 },
216
- { 214, "3062804041", "69C", 141300.00 },
217
- { 215, "3062804200", "13C", 129500.00 },
218
- { 216, "3062804300", "20C", 135500.00 },
219
- { 217, "3062804340", "96C", 150500.00 },
220
- { 218, "3062804341", "97C", 153300.00 },
207
+ { 205, "3053200300", "21C", 142000.00 },
208
+ { 206, "3053200331", "98C", 154500.00 },
209
+ { 207, "3060820100", "26C", 85900.00 },
210
+ { 208, "3061216100", "31C", 96100.00 },
211
+ { 209, "3061612100", "35C", 103300.00 },
212
+ { 210, "3062008100", "38C", 115300.00 },
213
+ { 211, "3062404100", "40C", 119100.00 },
214
+ { 212, "3062804000", "06C", 126100.00 },
215
+ { 213, "3062804040", "68C", 138100.00 },
216
+ { 214, "3062804041", "69C", 140900.00 },
217
+ { 215, "3062804200", "13C", 129100.00 },
218
+ { 216, "3062804300", "20C", 132100.00 },
219
+ { 217, "3062804340", "96C", 144100.00 },
220
+ { 218, "3062804341", "97C", 146900.00 },
221
221
  { 219, "3070816100", "25C", 84600.00 },
222
- { 220, "3071212100", "30C", 90200.00 },
223
- { 221, "3071608100", "34C", 99600.00 },
224
- { 222, "3072004100", "37C", 108200.00 },
225
- { 223, "3072404040", "66C", 133300.00 },
226
- { 224, "3072404340", "94C", 145300.00 },
227
- { 225, "3072408000", "05C", 111000.00 },
228
- { 226, "3072408040", "65C", 130500.00 },
229
- { 227, "3072408041", "67C", 136100.00 },
230
- { 228, "3072408200", "12C", 117000.00 },
231
- { 229, "3072408300", "19C", 123000.00 },
232
- { 230, "3072408340", "93C", 142500.00 },
233
- { 231, "3072408341", "95C", 148100.00 },
234
- { 232, "3080812100", "24C", 83800.00 },
235
- { 233, "3081208100", "29C", 89200.00 },
236
- { 234, "3081604100", "33C", 100800.00 },
237
- { 235, "3082004050", "63C", 124100.00 },
238
- { 236, "3082004350", "91C", 136100.00 },
239
- { 237, "3082008050", "62C", 121300.00 },
240
- { 238, "3082008350", "90C", 133300.00 },
241
- { 239, "3082012000", "04C", 99500.00 },
242
- { 240, "3082012050", "61C", 118500.00 },
243
- { 241, "3082012051", "64C", 126900.00 },
244
- { 242, "3082012200", "11C", 105500.00 },
245
- { 243, "3082012300", "18C", 111500.00 },
246
- { 244, "3082012350", "89C", 130500.00 },
247
- { 245, "3082012351", "92C", 138900.00 },
248
- { 246, "3090808100", "23C", 82800.00 },
249
- { 247, "3091204100", "28C", 90400.00 },
222
+ { 220, "3071212100", "30C", 95500.00 },
223
+ { 221, "3071608100", "34C", 106200.00 },
224
+ { 222, "3072004100", "37C", 112600.00 },
225
+ { 223, "3072404040", "66C", 132500.00 },
226
+ { 224, "3072404340", "94C", 138500.00 },
227
+ { 225, "3072408000", "05C", 113200.00 },
228
+ { 226, "3072408040", "65C", 129700.00 },
229
+ { 227, "3072408041", "67C", 135300.00 },
230
+ { 228, "3072408200", "12C", 116200.00 },
231
+ { 229, "3072408300", "19C", 119200.00 },
232
+ { 230, "3072408340", "93C", 135700.00 },
233
+ { 231, "3072408341", "95C", 141300.00 },
234
+ { 232, "3080812100", "24C", 84000.00 },
235
+ { 233, "3081208100", "29C", 98400.00 },
236
+ { 234, "3081604100", "33C", 103500.00 },
237
+ { 235, "3082004050", "63C", 125500.00 },
238
+ { 236, "3082004350", "91C", 131500.00 },
239
+ { 237, "3082008050", "62C", 122700.00 },
240
+ { 238, "3082008350", "90C", 128700.00 },
241
+ { 239, "3082012000", "04C", 103900.00 },
242
+ { 240, "3082012050", "61C", 119900.00 },
243
+ { 241, "3082012051", "64C", 128300.00 },
244
+ { 242, "3082012200", "11C", 106900.00 },
245
+ { 243, "3082012300", "18C", 109900.00 },
246
+ { 244, "3082012350", "89C", 125900.00 },
247
+ { 245, "3082012351", "92C", 134300.00 },
248
+ { 246, "3090808100", "23C", 86900.00 },
249
+ { 247, "3091204100", "28C", 95700.00 },
250
250
  { 248, "3091604050", "59C", 120900.00 },
251
- { 249, "3091604350", "87C", 132900.00 },
251
+ { 249, "3091604350", "87C", 126900.00 },
252
252
  { 250, "3091608050", "58C", 118100.00 },
253
- { 251, "3091608350", "86C", 130100.00 },
253
+ { 251, "3091608350", "86C", 124100.00 },
254
254
  { 252, "3091612050", "57C", 115300.00 },
255
- { 253, "3091612350", "85C", 127300.00 },
256
- { 254, "3091616000", "03C", 89000.00 },
255
+ { 253, "3091612350", "85C", 121300.00 },
256
+ { 254, "3091616000", "03C", 92000.00 },
257
257
  { 255, "3091616050", "56C", 112500.00 },
258
258
  { 256, "3091616051", "60C", 123700.00 },
259
259
  { 257, "3091616200", "10C", 95000.00 },
260
- { 258, "3091616300", "17C", 101000.00 },
261
- { 259, "3091616350", "84C", 124500.00 },
262
- { 260, "3091616351", "88C", 135700.00 },
263
- { 261, "3100804100", "22C", 84000.00 },
264
- { 262, "3101204060", "54C", 109700.00 },
265
- { 263, "3101204360", "82C", 121700.00 },
266
- { 264, "3101208060", "53C", 106900.00 },
267
- { 265, "3101208360", "81C", 118900.00 },
268
- { 266, "3101212060", "52C", 104100.00 },
269
- { 267, "3101212360", "80C", 116100.00 },
270
- { 268, "3101216060", "51C", 101300.00 },
271
- { 269, "3101216360", "79C", 113300.00 },
272
- { 270, "3101220000", "02C", 75500.00 },
273
- { 271, "3101220060", "50C", 98500.00 },
274
- { 272, "3101220061", "55C", 112500.00 },
275
- { 273, "3101220200", "09C", 81500.00 },
276
- { 274, "3101220300", "16C", 87500.00 },
277
- { 275, "3101220360", "78C", 110500.00 },
278
- { 276, "3101220361", "83C", 124500.00 },
279
- { 277, "3110804060", "48C", 107500.00 },
280
- { 278, "3110804360", "76C", 119500.00 },
281
- { 279, "3110808060", "47C", 104700.00 },
282
- { 280, "3110808360", "75C", 116700.00 },
283
- { 281, "3110812060", "46C", 101900.00 },
284
- { 282, "3110812360", "74C", 113900.00 },
285
- { 283, "3110816060", "45C", 99100.00 },
286
- { 284, "3110816360", "73C", 111100.00 },
287
- { 285, "3110820060", "44C", 96300.00 },
288
- { 286, "3110820360", "72C", 108300.00 },
289
- { 287, "3110824000", "01C", 66000.00 },
290
- { 288, "3110824060", "43C", 93500.00 },
291
- { 289, "3110824061", "49C", 110300.00 },
292
- { 290, "3110824200", "08C", 72000.00 },
293
- { 291, "3110824300", "15C", 78000.00 },
294
- { 292, "3110824360", "71C", 105500.00 },
295
- { 293, "3110824361", "77C", 122300.00 },
296
- { 294, "4050824100", "27D", 92700.00 },
297
- { 295, "4051220100", "32D", 93500.00 },
298
- { 296, "4051616100", "36D", 101400.00 },
299
- { 297, "4052012100", "39D", 108000.00 },
300
- { 298, "4052408100", "41D", 115400.00 },
301
- { 299, "4052804100", "42D", 126000.00 },
302
- { 300, "4053200000", "07D", 133000.00 },
260
+ { 258, "3091616300", "17C", 98000.00 },
261
+ { 259, "3091616350", "84C", 118500.00 },
262
+ { 260, "3091616351", "88C", 129700.00 },
263
+ { 261, "3100804100", "22C", 84200.00 },
264
+ { 262, "3101204060", "54C", 112600.00 },
265
+ { 263, "3101204360", "82C", 118600.00 },
266
+ { 264, "3101208060", "53C", 109800.00 },
267
+ { 265, "3101208360", "81C", 115800.00 },
268
+ { 266, "3101212060", "52C", 107000.00 },
269
+ { 267, "3101212360", "80C", 113000.00 },
270
+ { 268, "3101216060", "51C", 104200.00 },
271
+ { 269, "3101216360", "79C", 110200.00 },
272
+ { 270, "3101220000", "02C", 81400.00 },
273
+ { 271, "3101220060", "50C", 101400.00 },
274
+ { 272, "3101220061", "55C", 115400.00 },
275
+ { 273, "3101220200", "09C", 84400.00 },
276
+ { 274, "3101220300", "16C", 87400.00 },
277
+ { 275, "3101220360", "78C", 107400.00 },
278
+ { 276, "3101220361", "83C", 121400.00 },
279
+ { 277, "3110804060", "48C", 105600.00 },
280
+ { 278, "3110804360", "76C", 111600.00 },
281
+ { 279, "3110808060", "47C", 102800.00 },
282
+ { 280, "3110808360", "75C", 108800.00 },
283
+ { 281, "3110812060", "46C", 100000.00 },
284
+ { 282, "3110812360", "74C", 106000.00 },
285
+ { 283, "3110816060", "45C", 97200.00 },
286
+ { 284, "3110816360", "73C", 103200.00 },
287
+ { 285, "3110820060", "44C", 94400.00 },
288
+ { 286, "3110820360", "72C", 100400.00 },
289
+ { 287, "3110824000", "01C", 67100.00 },
290
+ { 288, "3110824060", "43C", 91600.00 },
291
+ { 289, "3110824061", "49C", 108400.00 },
292
+ { 290, "3110824200", "08C", 70100.00 },
293
+ { 291, "3110824300", "15C", 73100.00 },
294
+ { 292, "3110824360", "71C", 97600.00 },
295
+ { 293, "3110824361", "77C", 114400.00 },
296
+ { 294, "4050824100", "27D", 91700.00 },
297
+ { 295, "4051220100", "32D", 97400.00 },
298
+ { 296, "4051616100", "36D", 103900.00 },
299
+ { 297, "4052012100", "39D", 112400.00 },
300
+ { 298, "4052408100", "41D", 121800.00 },
301
+ { 299, "4052804100", "42D", 129200.00 },
302
+ { 300, "4053200000", "07D", 136000.00 },
303
303
  { 301, "4053200031", "70D", 148500.00 },
304
304
  { 302, "4053200200", "14D", 139000.00 },
305
- { 303, "4053200300", "21D", 145000.00 },
306
- { 304, "4053200331", "98D", 160500.00 },
307
- { 305, "4060820100", "26D", 87100.00 },
308
- { 306, "4061216100", "31D", 91000.00 },
309
- { 307, "4061612100", "35D", 100600.00 },
310
- { 308, "4062008100", "38D", 107000.00 },
311
- { 309, "4062404100", "40D", 116600.00 },
312
- { 310, "4062804000", "06D", 123500.00 },
313
- { 311, "4062804040", "68D", 138500.00 },
314
- { 312, "4062804041", "69D", 141300.00 },
315
- { 313, "4062804200", "13D", 129500.00 },
316
- { 314, "4062804300", "20D", 135500.00 },
317
- { 315, "4062804340", "96D", 150500.00 },
318
- { 316, "4062804341", "97D", 153300.00 },
305
+ { 303, "4053200300", "21D", 142000.00 },
306
+ { 304, "4053200331", "98D", 154500.00 },
307
+ { 305, "4060820100", "26D", 85900.00 },
308
+ { 306, "4061216100", "31D", 96100.00 },
309
+ { 307, "4061612100", "35D", 103300.00 },
310
+ { 308, "4062008100", "38D", 115300.00 },
311
+ { 309, "4062404100", "40D", 119100.00 },
312
+ { 310, "4062804000", "06D", 126100.00 },
313
+ { 311, "4062804040", "68D", 138100.00 },
314
+ { 312, "4062804041", "69D", 140900.00 },
315
+ { 313, "4062804200", "13D", 129100.00 },
316
+ { 314, "4062804300", "20D", 132100.00 },
317
+ { 315, "4062804340", "96D", 144100.00 },
318
+ { 316, "4062804341", "97D", 146900.00 },
319
319
  { 317, "4070816100", "25D", 84600.00 },
320
- { 318, "4071212100", "30D", 90200.00 },
321
- { 319, "4071608100", "34D", 99600.00 },
322
- { 320, "4072004100", "37D", 108200.00 },
323
- { 321, "4072404040", "66D", 133300.00 },
324
- { 322, "4072404340", "94D", 145300.00 },
325
- { 323, "4072408000", "05D", 111000.00 },
326
- { 324, "4072408040", "65D", 130500.00 },
327
- { 325, "4072408041", "67D", 136100.00 },
328
- { 326, "4072408200", "12D", 117000.00 },
329
- { 327, "4072408300", "19D", 123000.00 },
330
- { 328, "4072408340", "93D", 142500.00 },
331
- { 329, "4072408341", "95D", 148100.00 },
332
- { 330, "4080812100", "24D", 83800.00 },
333
- { 331, "4081208100", "29D", 89200.00 },
334
- { 332, "4081604100", "33D", 100800.00 },
335
- { 333, "4082004050", "63D", 124100.00 },
336
- { 334, "4082004350", "91D", 136100.00 },
337
- { 335, "4082008050", "62D", 121300.00 },
338
- { 336, "4082008350", "90D", 133300.00 },
339
- { 337, "4082012000", "04D", 99500.00 },
340
- { 338, "4082012050", "61D", 118500.00 },
341
- { 339, "4082012051", "64D", 126900.00 },
342
- { 340, "4082012200", "11D", 105500.00 },
343
- { 341, "4082012300", "18D", 111500.00 },
344
- { 342, "4082012350", "89D", 130500.00 },
345
- { 343, "4082012351", "92D", 138900.00 },
346
- { 344, "4090808100", "23D", 82800.00 },
347
- { 345, "4091204100", "28D", 90400.00 },
320
+ { 318, "4071212100", "30D", 95500.00 },
321
+ { 319, "4071608100", "34D", 106200.00 },
322
+ { 320, "4072004100", "37D", 112600.00 },
323
+ { 321, "4072404040", "66D", 132500.00 },
324
+ { 322, "4072404340", "94D", 138500.00 },
325
+ { 323, "4072408000", "05D", 113200.00 },
326
+ { 324, "4072408040", "65D", 129700.00 },
327
+ { 325, "4072408041", "67D", 135300.00 },
328
+ { 326, "4072408200", "12D", 116200.00 },
329
+ { 327, "4072408300", "19D", 119200.00 },
330
+ { 328, "4072408340", "93D", 135700.00 },
331
+ { 329, "4072408341", "95D", 141300.00 },
332
+ { 330, "4080812100", "24D", 84000.00 },
333
+ { 331, "4081208100", "29D", 98400.00 },
334
+ { 332, "4081604100", "33D", 103500.00 },
335
+ { 333, "4082004050", "63D", 125500.00 },
336
+ { 334, "4082004350", "91D", 131500.00 },
337
+ { 335, "4082008050", "62D", 122700.00 },
338
+ { 336, "4082008350", "90D", 128700.00 },
339
+ { 337, "4082012000", "04D", 103900.00 },
340
+ { 338, "4082012050", "61D", 119900.00 },
341
+ { 339, "4082012051", "64D", 128300.00 },
342
+ { 340, "4082012200", "11D", 106900.00 },
343
+ { 341, "4082012300", "18D", 109900.00 },
344
+ { 342, "4082012350", "89D", 125900.00 },
345
+ { 343, "4082012351", "92D", 134300.00 },
346
+ { 344, "4090808100", "23D", 86900.00 },
347
+ { 345, "4091204100", "28D", 95700.00 },
348
348
  { 346, "4091604050", "59D", 120900.00 },
349
- { 347, "4091604350", "87D", 132900.00 },
349
+ { 347, "4091604350", "87D", 126900.00 },
350
350
  { 348, "4091608050", "58D", 118100.00 },
351
- { 349, "4091608350", "86D", 130100.00 },
351
+ { 349, "4091608350", "86D", 124100.00 },
352
352
  { 350, "4091612050", "57D", 115300.00 },
353
- { 351, "4091612350", "85D", 127300.00 },
354
- { 352, "4091616000", "03D", 89000.00 },
353
+ { 351, "4091612350", "85D", 121300.00 },
354
+ { 352, "4091616000", "03D", 92000.00 },
355
355
  { 353, "4091616050", "56D", 112500.00 },
356
356
  { 354, "4091616051", "60D", 123700.00 },
357
357
  { 355, "4091616200", "10D", 95000.00 },
358
- { 356, "4091616300", "17D", 101000.00 },
359
- { 357, "4091616350", "84D", 124500.00 },
360
- { 358, "4091616351", "88D", 135700.00 },
361
- { 359, "4100804100", "22D", 84000.00 },
362
- { 360, "4101204060", "54D", 109700.00 },
363
- { 361, "4101204360", "82D", 121700.00 },
364
- { 362, "4101208060", "53D", 106900.00 },
365
- { 363, "4101208360", "81D", 118900.00 },
366
- { 364, "4101212060", "52D", 104100.00 },
367
- { 365, "4101212360", "80D", 116100.00 },
368
- { 366, "4101216060", "51D", 101300.00 },
369
- { 367, "4101216360", "79D", 113300.00 },
370
- { 368, "4101220000", "02D", 75500.00 },
371
- { 369, "4101220060", "50D", 98500.00 },
372
- { 370, "4101220061", "55D", 112500.00 },
373
- { 371, "4101220200", "09D", 81500.00 },
374
- { 372, "4101220300", "16D", 87500.00 },
375
- { 373, "4101220360", "78D", 110500.00 },
376
- { 374, "4101220361", "83D", 124500.00 },
377
- { 999, "4110320000", "99Z", 170000.00 }, // semifinal
378
- { 375, "4110804060", "48D", 107500.00 },
379
- { 376, "4110804360", "76D", 119500.00 },
380
- { 377, "4110808060", "47D", 104700.00 },
381
- { 378, "4110808360", "75D", 116700.00 },
382
- { 379, "4110812060", "46D", 101900.00 },
383
- { 380, "4110812360", "74D", 113900.00 },
384
- { 381, "4110816060", "45D", 99100.00 },
385
- { 382, "4110816360", "73D", 111100.00 },
386
- { 383, "4110820060", "44D", 96300.00 },
387
- { 384, "4110820360", "72D", 108300.00 },
388
- { 385, "4110824000", "01D", 66000.00 },
389
- { 386, "4110824060", "43D", 93500.00 },
390
- { 387, "4110824061", "49D", 110300.00 },
391
- { 388, "4110824200", "08D", 72000.00 },
392
- { 389, "4110824300", "15D", 78000.00 },
393
- { 390, "4110824360", "71D", 105500.00 },
394
- { 391, "4110824361", "77D", 122300.00 },
358
+ { 356, "4091616300", "17D", 98000.00 },
359
+ { 357, "4091616350", "84D", 118500.00 },
360
+ { 358, "4091616351", "88D", 129700.00 },
361
+ { 359, "4100804100", "22D", 84200.00 },
362
+ { 360, "4101204060", "54D", 112600.00 },
363
+ { 361, "4101204360", "82D", 118600.00 },
364
+ { 362, "4101208060", "53D", 109800.00 },
365
+ { 363, "4101208360", "81D", 115800.00 },
366
+ { 364, "4101212060", "52D", 107000.00 },
367
+ { 365, "4101212360", "80D", 113000.00 },
368
+ { 366, "4101216060", "51D", 104200.00 },
369
+ { 367, "4101216360", "79D", 110200.00 },
370
+ { 368, "4101220000", "02D", 81400.00 },
371
+ { 369, "4101220060", "50D", 101400.00 },
372
+ { 370, "4101220061", "55D", 115400.00 },
373
+ { 371, "4101220200", "09D", 84400.00 },
374
+ { 372, "4101220300", "16D", 87400.00 },
375
+ { 373, "4101220360", "78D", 107400.00 },
376
+ { 374, "4101220361", "83D", 121400.00 },
377
+ { 375, "4110804060", "48D", 105600.00 },
378
+ { 376, "4110804360", "76D", 111600.00 },
379
+ { 377, "4110808060", "47D", 102800.00 },
380
+ { 378, "4110808360", "75D", 108800.00 },
381
+ { 379, "4110812060", "46D", 100000.00 },
382
+ { 380, "4110812360", "74D", 106000.00 },
383
+ { 381, "4110816060", "45D", 97200.00 },
384
+ { 382, "4110816360", "73D", 103200.00 },
385
+ { 383, "4110820060", "44D", 94400.00 },
386
+ { 384, "4110820360", "72D", 100400.00 },
387
+ { 385, "4110824000", "01D", 67100.00 },
388
+ { 386, "4110824060", "43D", 91600.00 },
389
+ { 387, "4110824061", "49D", 108400.00 },
390
+ { 388, "4110824200", "08D", 70100.00 },
391
+ { 389, "4110824300", "15D", 73100.00 },
392
+ { 390, "4110824360", "71D", 97600.00 },
393
+ { 391, "4110824361", "77D", 114400.00 },
395
394
  };
data/ext/WPBDC/sketch.c CHANGED
@@ -88,7 +88,7 @@ void set_viewport(IMAGE *image,
88
88
 
89
89
  // Return a pointer to the RGB triple at the given row and column
90
90
  // within the given image. Row zero is at top of image.
91
- INLINE RGB_TRIPLE *rgb_triple_rc(IMAGE *image, UNSIGNED row, UNSIGNED col)
91
+ static INLINE RGB_TRIPLE *rgb_triple_rc(IMAGE *image, UNSIGNED row, UNSIGNED col)
92
92
  {
93
93
  assert(row < image->height);
94
94
  assert(col < image->width);
@@ -96,7 +96,7 @@ INLINE RGB_TRIPLE *rgb_triple_rc(IMAGE *image, UNSIGNED row, UNSIGNED col)
96
96
  }
97
97
 
98
98
  // Same as above, but use x and y rather than row and column.
99
- INLINE RGB_TRIPLE *rgb_triple_xy(IMAGE *image, UNSIGNED x, UNSIGNED y)
99
+ static INLINE RGB_TRIPLE *rgb_triple_xy(IMAGE *image, UNSIGNED x, UNSIGNED y)
100
100
  {
101
101
  return rgb_triple_rc(image, image->height - 1 - y, x);
102
102
  }
@@ -177,14 +177,13 @@ void draw_rect_raw(IMAGE *image,
177
177
  draw_line_raw(image, x1, y2, x1, y1, color);
178
178
  }
179
179
 
180
-
181
180
  // Implementation of Cohen-Sutherland line clipping.
182
181
  #define LEFT 8
183
182
  #define TOP 4
184
183
  #define RIGHT 2
185
184
  #define BOTTOM 1
186
185
 
187
- INLINE unsigned clip_code(FLOAT x, FLOAT y,
186
+ static INLINE unsigned clip_code(FLOAT x, FLOAT y,
188
187
  FLOAT x_left, FLOAT y_top, FLOAT x_right, FLOAT y_bottom)
189
188
  {
190
189
  unsigned code;
@@ -493,4 +492,4 @@ int main(void)
493
492
  return 0;
494
493
  }
495
494
 
496
- #endif
495
+ #endif
data/lib/WPBDC.rb CHANGED
@@ -2,6 +2,10 @@ require 'WPBDC/WPBDC'
2
2
 
3
3
  module WPBDC
4
4
 
5
+ # Publish the contest year for the rest of the system. This allows us
6
+ # to decouple the judge contest year from the system during transition periods.
7
+ CONTEST_YEAR = 2015
8
+
5
9
  # A useful constant for finding test data.
6
10
  PATH = File.dirname(__FILE__)
7
11
 
@@ -11,4 +15,5 @@ module WPBDC
11
15
  def self.local_contest_code_to_id(code)
12
16
  code.length == 6 ? local_contest_number_to_id(code[-3..-1]) : nil
13
17
  end
14
- end
18
+
19
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: WPBDC
3
3
  version: !ruby/object:Gem::Version
4
- version: 2014.3.9
4
+ version: 2015.3.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gene Ressler
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-11 00:00:00.000000000 Z
11
+ date: 2015-01-10 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Container for C code extension that implements the West Point Bridge
14
14
  Contest Judge.