Commit
·
3117c21
1
Parent(s):
324a78a
removed temperature
Browse files
DataService/enhanced_generator.py
CHANGED
|
@@ -256,7 +256,7 @@ class EnhancedMetroDataGenerator:
|
|
| 256 |
estimated_hours = random.randint(2, 24)
|
| 257 |
|
| 258 |
job = {
|
| 259 |
-
"
|
| 260 |
"trainset_id": ts_id,
|
| 261 |
"work_order_number": f"WO-{random.randint(100000, 999999)}",
|
| 262 |
"job_type": random.choice(job_types),
|
|
@@ -444,11 +444,6 @@ class EnhancedMetroDataGenerator:
|
|
| 444 |
"bogie_2": round(random.uniform(0.5, 3.5) / reliability_factor, 2),
|
| 445 |
"unit": "mm/s"
|
| 446 |
},
|
| 447 |
-
"temperature": {
|
| 448 |
-
"motor_1": round(random.uniform(45, 85) + (1 - reliability_factor) * 10, 1),
|
| 449 |
-
"motor_2": round(random.uniform(45, 85) + (1 - reliability_factor) * 10, 1),
|
| 450 |
-
"unit": "°C"
|
| 451 |
-
},
|
| 452 |
"overall_condition": "Good" if reliability_factor > 0.85 else "Fair" if reliability_factor > 0.75 else "Poor"
|
| 453 |
}
|
| 454 |
sensor_data.append(sensors)
|
|
@@ -560,8 +555,7 @@ class EnhancedMetroDataGenerator:
|
|
| 560 |
return {
|
| 561 |
"date": datetime.now().date().isoformat(),
|
| 562 |
"weather": {
|
| 563 |
-
"condition": random.choice(["Clear", "Cloudy", "Rainy"])
|
| 564 |
-
"temperature": round(random.uniform(20, 35), 1)
|
| 565 |
},
|
| 566 |
"ridership_forecast": {
|
| 567 |
"expected_passengers": random.randint(80000, 150000),
|
|
|
|
| 256 |
estimated_hours = random.randint(2, 24)
|
| 257 |
|
| 258 |
job = {
|
| 259 |
+
"job_card_id": f"JC-{random.randint(10000, 99999)}",
|
| 260 |
"trainset_id": ts_id,
|
| 261 |
"work_order_number": f"WO-{random.randint(100000, 999999)}",
|
| 262 |
"job_type": random.choice(job_types),
|
|
|
|
| 444 |
"bogie_2": round(random.uniform(0.5, 3.5) / reliability_factor, 2),
|
| 445 |
"unit": "mm/s"
|
| 446 |
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 447 |
"overall_condition": "Good" if reliability_factor > 0.85 else "Fair" if reliability_factor > 0.75 else "Poor"
|
| 448 |
}
|
| 449 |
sensor_data.append(sensors)
|
|
|
|
| 555 |
return {
|
| 556 |
"date": datetime.now().date().isoformat(),
|
| 557 |
"weather": {
|
| 558 |
+
"condition": random.choice(["Clear", "Cloudy", "Rainy"])
|
|
|
|
| 559 |
},
|
| 560 |
"ridership_forecast": {
|
| 561 |
"expected_passengers": random.randint(80000, 150000),
|
DataService/synthetic_base.py
CHANGED
|
@@ -119,13 +119,6 @@ class MetroSyntheticDataGenerator:
|
|
| 119 |
"bogie_2": round(random.uniform(0.5, 3.5), 2),
|
| 120 |
"unit": "mm/s"
|
| 121 |
},
|
| 122 |
-
"temperature": {
|
| 123 |
-
"motor_1": round(random.uniform(45, 85), 1),
|
| 124 |
-
"motor_2": round(random.uniform(45, 85), 1),
|
| 125 |
-
"brake_disc": round(random.uniform(25, 120), 1),
|
| 126 |
-
"cabin": round(random.uniform(18, 28), 1),
|
| 127 |
-
"unit": "°C"
|
| 128 |
-
},
|
| 129 |
"pressure": {
|
| 130 |
"brake_system": round(random.uniform(5.5, 8.5), 2),
|
| 131 |
"pneumatic_doors": round(random.uniform(6.0, 8.0), 2),
|
|
@@ -266,7 +259,6 @@ class MetroSyntheticDataGenerator:
|
|
| 266 |
return {
|
| 267 |
"date": datetime.now().date().isoformat(),
|
| 268 |
"weather": {
|
| 269 |
-
"temperature": round(random.uniform(20, 35), 1),
|
| 270 |
"humidity": random.randint(60, 90),
|
| 271 |
"rainfall_mm": round(random.uniform(0, 50), 1),
|
| 272 |
"condition": random.choice(["Clear", "Cloudy", "Rainy", "Stormy"])
|
|
|
|
| 119 |
"bogie_2": round(random.uniform(0.5, 3.5), 2),
|
| 120 |
"unit": "mm/s"
|
| 121 |
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 122 |
"pressure": {
|
| 123 |
"brake_system": round(random.uniform(5.5, 8.5), 2),
|
| 124 |
"pneumatic_doors": round(random.uniform(6.0, 8.0), 2),
|
|
|
|
| 259 |
return {
|
| 260 |
"date": datetime.now().date().isoformat(),
|
| 261 |
"weather": {
|
|
|
|
| 262 |
"humidity": random.randint(60, 90),
|
| 263 |
"rainfall_mm": round(random.uniform(0, 50), 1),
|
| 264 |
"condition": random.choice(["Clear", "Cloudy", "Rainy", "Stormy"])
|
docs/FEATURES_NEEDED.md
CHANGED
|
@@ -213,11 +213,11 @@ The GreedyOptim system uses constraint-based optimization algorithms (GA, PSO, C
|
|
| 213 |
| Feature | Description | Priority | Importance |
|
| 214 |
|---------|-------------|----------|------------|
|
| 215 |
| `vibration_levels` | Bogie vibration (mm/s) | **LOW** | 2/5 |
|
| 216 |
-
| `temperature_readings` | Motor temperature (°C) | **LOW** | 2/5 |
|
| 217 |
| `power_consumption` | Energy usage (kWh) | **LOW** | 2/5 |
|
| 218 |
| `door_cycle_count` | Door operations | **LOW** | 2/5 |
|
| 219 |
|
| 220 |
**Use Case:** Real-time condition monitoring to update health scores
|
|
|
|
| 221 |
|
| 222 |
---
|
| 223 |
|
|
@@ -499,10 +499,11 @@ dow_cos = cos(2 * π * day_of_week / 7)
|
|
| 499 |
**Nice-to-Have:**
|
| 500 |
|
| 501 |
1. **IoT Sensor Streams**
|
| 502 |
-
- Vibration,
|
| 503 |
- Real-time monitoring
|
| 504 |
- **Collection Method:** IoT platform integration
|
| 505 |
- **Frequency:** Real-time (every second/minute)
|
|
|
|
| 506 |
|
| 507 |
2. **External Factors**
|
| 508 |
- Weather data
|
|
@@ -713,7 +714,7 @@ dow_cos = cos(2 * π * day_of_week / 7)
|
|
| 713 |
4. **IoT Platform** (if available)
|
| 714 |
- Real-time sensor data
|
| 715 |
- Component health (automated)
|
| 716 |
-
- Vibration,
|
| 717 |
|
| 718 |
5. **Contract Management System**
|
| 719 |
- Branding contracts
|
|
|
|
| 213 |
| Feature | Description | Priority | Importance |
|
| 214 |
|---------|-------------|----------|------------|
|
| 215 |
| `vibration_levels` | Bogie vibration (mm/s) | **LOW** | 2/5 |
|
|
|
|
| 216 |
| `power_consumption` | Energy usage (kWh) | **LOW** | 2/5 |
|
| 217 |
| `door_cycle_count` | Door operations | **LOW** | 2/5 |
|
| 218 |
|
| 219 |
**Use Case:** Real-time condition monitoring to update health scores
|
| 220 |
+
**Note:** Temperature data removed - not used for optimization (only as optional constraint: max ~800°C)
|
| 221 |
|
| 222 |
---
|
| 223 |
|
|
|
|
| 499 |
**Nice-to-Have:**
|
| 500 |
|
| 501 |
1. **IoT Sensor Streams**
|
| 502 |
+
- Vibration, power consumption
|
| 503 |
- Real-time monitoring
|
| 504 |
- **Collection Method:** IoT platform integration
|
| 505 |
- **Frequency:** Real-time (every second/minute)
|
| 506 |
+
- **Note:** Temperature excluded (not used in optimization)
|
| 507 |
|
| 508 |
2. **External Factors**
|
| 509 |
- Weather data
|
|
|
|
| 714 |
4. **IoT Platform** (if available)
|
| 715 |
- Real-time sensor data
|
| 716 |
- Component health (automated)
|
| 717 |
+
- Vibration, power consumption, door cycles, etc.
|
| 718 |
|
| 719 |
5. **Contract Management System**
|
| 720 |
- Branding contracts
|