Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/issues 253 adds vr impact #368

Merged
merged 8 commits into from
Feb 9, 2025
Merged

Feat/issues 253 adds vr impact #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6cda2b3
feat(config):issue-253 adds archetype for vr devices and impact from…
ju3ouz4n Jan 21, 2025
dc8c7a0
feat(dto):issue-253 adds new models and dtos
ju3ouz4n Jan 21, 2025
01019d4
feat(routes):issue-253 add new routes
ju3ouz4n Jan 21, 2025
46689ae
feat(routes):issue-253 add computes
ju3ouz4n Jan 21, 2025
81fe796
chore(dataconfig): adds test datas
ju3ouz4n Jan 22, 2025
7951ced
chore(data source): Updated VR_* impact data sources according to PR …
ju3ouz4n Feb 3, 2025
b203fec
Update factors.yml
da-ekchajzer Feb 9, 2025
aac5d5c
typo for adpe "olded" => "oled"
da-ekchajzer Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion boaviztapi/data/archetypes/user_terminal.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ smartwatch-default,peripheral,smartwatch,default,1,,0
box-default,terminal,box,default,1,43800,10;5;20
usb-stick-default,peripheral,usb_stick,default,0.05,43800,0.3;0.12;0.63
external-ssd-default,peripheral,external_ssd,default,0.05,43800,2.5;0.5;5
hdd-default,peripheral,external_hdd,default,0.05,43800,7.75;6.5;9
hdd-default,peripheral,external_hdd,default,0.05,43800,7.75;6.5;9
vr-headset-oled,terminal,vr_headset,oled,0.01,43800,710;710;710
vr-headset-lcd,terminal,vr_headset,lcd,0.01,43800,692;692;692
vr-controller-default,peripheral,vr_controller,default,0.01,43800,7.90;7.90;7.90
2 changes: 2 additions & 0 deletions boaviztapi/data/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ default_usb_stick: "usb-stick-default"
default_external_ssd: "external-ssd-default"
default_external_hdd: "hdd-default"
default_iot_device: "iot-device-default"
default_vr_headset: "vr-headset-lcd"
default_vr_controller: "vr-controller-default"

default_criteria: ["gwp", "adp", "pe"]

Expand Down
291 changes: 290 additions & 1 deletion boaviztapi/data/factors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2916,6 +2916,294 @@
}
}


"VR_CONTROLLER": {
"adpe": {
"impact": 1.07e-03,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"adpf": {
"impact": 5.45e+01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"ap": {
"impact": 4.28e-02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"ctue": {
"impact": 5.11e+01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"ctuh-c": {
"impact": 5.95e-08,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"ctuh-nc": {
"impact": 1.85e-07,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"epf": {
"impact": 9.87e-05,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"epm": {
"impact": 4.28e-03,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"ept": {
"impact": 4.49e-02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"gwp": {
"impact": 4.22e+00,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"gwpb": {
"impact": 1.97e-02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"gwpf": {
"impact": 4.20e+00,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"gwplu": {
"impact": 4.14e-06,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"ir": {
"impact": 2.50e+00,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"lu": {
"impact": 5.73e-01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"odp": {
"impact": 7.66e-07,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"pm": {
"impact": 2.22e-07,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"pocp": {
"impact": 1.46e-02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"wu": {
"impact": 3.99e+01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"mips": {
"impact": 5.47e+01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
}

"VR_HEADSET": {
"adpe": {
"lcd": {
"impact": 3.33e-03,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 4.54e-03,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"adpf": {
"lcd": {
"impact": 6.11e+02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 1.35e+03,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"ap": {
"lcd": {
"impact": 2.64e-01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 5.96e-01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"ctue": {
"lcd": {
"impact": 6.82e+02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 1.68e+03,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"ctuh-c": {
"lcd": {
"impact": 1.31e-06,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 5.00e-06,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"ctuh-nc": {
"lcd": {
"impact": 6.84e-07,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 1.02e-06,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"epf": {
"lcd": {
"impact": 7.00e-04,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 1.11e-04,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"epm": {
"lcd": {
"impact": 3.74e-02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 1.22e-01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"ept": {
"lcd": {
"impact": 3.69e-01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 7.69e-01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"gwp": {
"lcd": {
"impact": 4.59e+01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 8.94e+01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"gwpb": {
"lcd": {
"impact": 8.83e-02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 4.33e-01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"gwpf": {
"lcd": {
"impact": 4.30e+02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 8.89e+01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"gwplu": {
"lcd": {
"impact": 9.55e-05,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 4.73e-08,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"ir": {
"lcd": {
"impact": 1.54e+01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 2.12e+02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"lu": {
"lcd": {
"impact": 1.71e+00,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 1.18e+00,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"odp": {
"lcd": {
"impact": 1.52e-05,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 8.39e-06,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"pm": {
"lcd": {
"impact": 1.50e-06,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 3.30e-06,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"pocp": {
"lcd": {
"impact": 1.15e-01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 2.41e-01,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"wu": {
"lcd": {
"impact": 1.27e+02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 4.29e+02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
},
"mips": {
"lcd": {
"impact": 1.54e+02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
},
"oled": {
"impact": 3.03e+02,
"source": "CEPIR : Cas d'Étude Pour un Immersif Responsable, 2022"
}
}
}


"electricity": {
"WOR": {
"country": "World",
Expand Down Expand Up @@ -19088,4 +19376,5 @@
"Albania": "ALB",
"United Arab Emirates": "ARE"
}
}
}

12 changes: 11 additions & 1 deletion boaviztapi/dto/device/user_terminal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from boaviztapi.dto.usage.usage import mapper_usage
from boaviztapi.model.device import Device
from boaviztapi.model.device.userTerminal import DeviceLaptop, DeviceDesktop, DeviceTablet, DeviceSmartphone, \
DeviceTelevision, DeviceBox, DeviceUsbStick, DeviceSmartWatch, DeviceExternalHDD, DeviceMonitor, DeviceExternalSSD
DeviceTelevision, DeviceBox, DeviceUsbStick, DeviceSmartWatch, DeviceExternalHDD, DeviceMonitor, DeviceExternalSSD, DeviceVrController, DeviceVrHeadset
from boaviztapi.service.archetype import get_arch_component


Expand Down Expand Up @@ -56,6 +56,11 @@ class Monitor(UserTerminal):
class ExternalSSD(UserTerminal):
pass

class VrHeadset(UserTerminal):
type: Optional[str] = None

class VrController(UserTerminal):
pass

def mapper_user_terminal(user_terminal_dto: UserTerminal, archetype) -> Device:
if type(user_terminal_dto) == Laptop:
Expand Down Expand Up @@ -83,6 +88,11 @@ def mapper_user_terminal(user_terminal_dto: UserTerminal, archetype) -> Device:
model = DeviceExternalSSD(archetype=archetype)
elif type(user_terminal_dto) == Monitor:
model = DeviceMonitor(archetype=archetype)
elif type(user_terminal_dto) == VrController:
model = DeviceVrController(archetype=archetype)
elif type(user_terminal_dto) == VrHeadset:
model = DeviceVrHeadset(archetype=archetype)
model.type.set_input(user_terminal_dto.type)
else:
raise Exception("User Terminal Type not found")

Expand Down
17 changes: 17 additions & 0 deletions boaviztapi/model/device/userTerminal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,20 @@ class DeviceMonitor(EndUserDevice, ABC):

def __init__(self, archetype=get_user_terminal_archetype(config["default_monitor"]), **kwargs):
super().__init__(archetype=archetype, **kwargs)

class DeviceVrHeadset(EndUserDevice, ABC):
NAME = "VR_HEADSET"

def __init__(self, archetype=get_user_terminal_archetype(config["default_vr_headset"]), **kwargs):
super().__init__(archetype=archetype, **kwargs)
self.type = Boattribute(
default=get_arch_value(archetype, 'type', 'default'),
min=get_arch_value(archetype, 'type', 'min'),
max=get_arch_value(archetype, 'type', 'max')
)

class DeviceVrController(EndUserDevice, ABC):
NAME = "VR_CONTROLLER"

def __init__(self, archetype=get_user_terminal_archetype(config["default_vr_controller"]), **kwargs):
super().__init__(archetype=archetype, **kwargs)
Loading