Skip to content

Commit

Permalink
Fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
uyxela committed Sep 20, 2020
1 parent 9d4eb12 commit dc7545f
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 38 deletions.
52 changes: 26 additions & 26 deletions .firebase/hosting.YnVpbGQ.cache
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
asset-manifest.json,1600610259650,dd27f9d05c611bffac57c5373d48e1f13268427f806e2c8333f15c873050757d
favicon.ico,1600610228960,12c77055696278694a8feb77a9421dd85f8af25a81d812822be112e4be628fcf
index.html,1600610259640,ffe0b4a8d0c1b6cb329ea7de4ee8bc26b778a342d65dada87e72d956ba19babc
logo192.png,1600610228960,76c449ccb9cd117c2f2338f091b18f7050f3210e249b2228f5c81b23f34377cd
manifest.json,1600610228960,0958a5e0c831126100c8c2d06a6bbaa665a3900f21aaff4130238a6f5a113aa1
logo512.png,1600610228960,7779210d56c1f3741e2e487799fe3092def4fa6ac450a60532b807c3a8971205
precache-manifest.087cede7e739bd9973a1857194e00454.js,1600610259650,18d3ffafcac5f0307aa9db9676a38dcd3c7b75cea6b8e07e838a19f81cbe513e
robots.txt,1600610228960,2544ca049f223a42bff01f72ad930a5edba75bbb7199d0f8430a02ff5aca16ec
service-worker.js,1600610259650,3efa61b6b1c86e9481165886766b09a1e121d5f1cd56e523bdc1f317d55c334c
static/css/main.97ba0920.chunk.css,1600610259640,b7ac7cb9ae6438a1845c456055a46553f5a345d3311579debaf11c4c33ab2aca
static/js/2.e2177470.chunk.js.LICENSE.txt,1600610259640,312b03527a4464abd4aefc477a6098190e53a4230e981386f2f55ed0e5731c19
static/css/main.97ba0920.chunk.css.map,1600610259640,49598a56da7d95654347835d57239e327309f6a8724dc4ea19929278fcb08c97
static/js/runtime-main.2b546755.js,1600610259640,1a32b3ae478864d16395ba8fb804885ddd877291ddc34cef54a19886522dc141
static/js/runtime-main.2b546755.js.map,1600610259650,af281585296357cc48db20525bcba81a70a07eb67aae11ee6cf4ec9af56d497d
static/media/environment.2979ba4c.svg,1600610259630,2a953704416ffc5eea1ac0b9e2f325455b3146a85dcedeefd0f84c9a37452a79
static/media/large2.7ecab68b.svg,1600610259640,15efb7f69be05cf853b32a0afc0c27a23595234056807d2ed1af78c11158cfa0
static/media/large3.9e63e847.svg,1600610259640,940a95333f8ee4268649c5fc4b0ccd94545177be08f68325598764d828c74396
static/media/large1.e369b29c.svg,1600610259640,890d3c4eb901ca032784d21f9ab836c2e70ece158a6db45447fdeea0d373734d
static/media/large6.9a6143d3.svg,1600610259640,377f68f7cae6b1a96865facd12db044c58919442dcd2e93ab0d9f57b009e500e
static/media/large4.7441baee.svg,1600610259640,17a5fc9f4d854b85efaff7b7d1c16468f6efaa79225d026c8c27f86758161e00
static/media/large5.79f50a14.svg,1600610259640,826f5c7550594b9a24a0da4be436064b435c6eb04f61407cd5bc64d445910ae8
static/media/logo.9cdc0432.svg,1600610259640,dac28a3894d837099dea6045208845eee0b61c60ee841c868563e7c6001567d6
static/js/main.d08b0b92.chunk.js.map,1600610259640,803ba431d5c86eaa9e2360ea48af7146f6f09fe19eb119d302c7eb07b336264c
static/js/2.e2177470.chunk.js,1600610259640,6d12f4a6a8e9929096347d1e3f499094df47542d377a3f91ca31df86f96b93b6
static/js/main.d08b0b92.chunk.js,1600610259640,65a9cdf47c4edeafe51d9e655642db11a3fe75f5babe4308442574d5bbddf1f8
static/js/2.e2177470.chunk.js.map,1600610259650,59878a444bbf12584fda40d5e5471190d9098f010e4ad17d4ee7a791a53addcd
asset-manifest.json,1600613753670,a4f533ace98f18e76a8c8eff43c3fdd2f0ba33476616c4eb1332b4b12d4832f6
favicon.ico,1600613725240,12c77055696278694a8feb77a9421dd85f8af25a81d812822be112e4be628fcf
index.html,1600613753670,179b8d409d73c3d09d12dda7ee9645a3070b5828be68c723f657437d459e0902
logo192.png,1600613725240,76c449ccb9cd117c2f2338f091b18f7050f3210e249b2228f5c81b23f34377cd
manifest.json,1600613725240,c1ac2d39efb04b7c5791ad794d1af9e41e9480972f03d6d8d37f124cf7075127
precache-manifest.0c2814774c4140da68c11d46954a9390.js,1600613753670,9e835d7695e1d173969202536732451f3789d9df4c347cb070e72911ef7acbee
robots.txt,1600613725240,2544ca049f223a42bff01f72ad930a5edba75bbb7199d0f8430a02ff5aca16ec
service-worker.js,1600613753670,2f10f3750dc412f793f542f43c585a9be5fc94b2815d8cfe8900377758dc4516
logo512.png,1600613725240,7779210d56c1f3741e2e487799fe3092def4fa6ac450a60532b807c3a8971205
static/css/main.97ba0920.chunk.css,1600613753660,b7ac7cb9ae6438a1845c456055a46553f5a345d3311579debaf11c4c33ab2aca
static/css/main.97ba0920.chunk.css.map,1600613753660,49598a56da7d95654347835d57239e327309f6a8724dc4ea19929278fcb08c97
static/js/2.286a0f37.chunk.js.LICENSE.txt,1600613753660,312b03527a4464abd4aefc477a6098190e53a4230e981386f2f55ed0e5731c19
static/js/runtime-main.2b546755.js,1600613753670,1a32b3ae478864d16395ba8fb804885ddd877291ddc34cef54a19886522dc141
static/js/runtime-main.2b546755.js.map,1600613753680,af281585296357cc48db20525bcba81a70a07eb67aae11ee6cf4ec9af56d497d
static/media/environment.2979ba4c.svg,1600613753660,2a953704416ffc5eea1ac0b9e2f325455b3146a85dcedeefd0f84c9a37452a79
static/media/large2.7ecab68b.svg,1600613753660,15efb7f69be05cf853b32a0afc0c27a23595234056807d2ed1af78c11158cfa0
static/media/large3.9e63e847.svg,1600613753660,940a95333f8ee4268649c5fc4b0ccd94545177be08f68325598764d828c74396
static/media/large6.9a6143d3.svg,1600613753660,377f68f7cae6b1a96865facd12db044c58919442dcd2e93ab0d9f57b009e500e
static/media/large4.7441baee.svg,1600613753660,17a5fc9f4d854b85efaff7b7d1c16468f6efaa79225d026c8c27f86758161e00
static/media/large1.e369b29c.svg,1600613753660,890d3c4eb901ca032784d21f9ab836c2e70ece158a6db45447fdeea0d373734d
static/media/large5.79f50a14.svg,1600613753660,826f5c7550594b9a24a0da4be436064b435c6eb04f61407cd5bc64d445910ae8
static/media/logo.9cdc0432.svg,1600613753660,dac28a3894d837099dea6045208845eee0b61c60ee841c868563e7c6001567d6
static/js/main.da4fd71a.chunk.js.map,1600613753660,00a155cf4b5a35ebe4974efa229f586567f18ddf9cc2c03bf4675b2e0fc2b51d
static/js/2.286a0f37.chunk.js,1600613753670,7950c884a379a1119ecdd251d6db5f371a0c5dc1548072f8b7bac5d22c35f2a3
static/js/main.da4fd71a.chunk.js,1600613753660,baa77b249d1ea20d9b8fc8f5948230c0d6640984920157caeade8594a2a9f9a8
static/js/2.286a0f37.chunk.js.map,1600613753680,14b15c69d154bc2bbff3e8866c2828bcdcc8980410c79b5d3f781d3a6641e8f0
7 changes: 0 additions & 7 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"firestore": {
"rules": "firestore.rules",
"indexes": "firestore.indexes.json"
},
"hosting": {
"public": "build",
"ignore": [
Expand All @@ -16,8 +12,5 @@
"destination": "/index.html"
}
]
},
"storage": {
"rules": "storage.rules"
}
}
5 changes: 2 additions & 3 deletions src/components/compare/compareComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,15 @@ const checkInputted = () => {

const CompareComponent = () => {
const [selected, setSelected] = useState("Satori");
const [computer, setComputer] = useState({"Rank":"7","TOP500 Rank":"421","Name":"Satori","Computer":"IBM Power System AC922, IBM POWER9 20C 2.4GHz, Infiniband EDR, NVIDIA Tesla V100 SXM2","Site":"MIT/MGHPCC Holyoke, MA","Manufacturer":"IBM","Country":"United States","Year":"2019","Segment":"Academic","Total Cores":"23040","Accelerator/Co-Processor Cores":"20480","Rmax [TFlop/s]":"1464","Rpeak [TFlop/s]":"1739.78","Power (kW)":"94","Power Source":"","Power Efficiency [GFlops/Watts]":"15.57446809","Power Quality Level":"0","Measured Cores":"","Optimized Run (HPL)":"","Optimized Run (Peak Power)":"","Architecture":"Cluster","Processor":"IBM POWER9 20C 2.4GHz","Processor Technology":"Power","Processor Speed (MHz)":"2400","Operating System":"RHEL 7.6","OS Family":"RHEL 7.6","Accelerator/Co-Processor":"NVIDIA Tesla V100 SXM2","Cores per Socket":"20","Processor Generation":"IBM POWER9","System Model":"IBM Power System AC922","System Family":"IBM Power Systems","Interconnect Family":"Infiniband","Interconnect":"Infiniband EDR","Continent":"North America","Site ID":"50822","System ID":"179780"});

return (
<CompareContainer>
<CompareSelect value={selected} onChange={e => setSelected(e.target.value)}>
{checkInputted ? <option value="This">Your Machine</option> : null}
{green.map(item => <option value={item.Name} onClick={() => setComputer(item)}>Rank {item.Rank}: {item.Name}</option>)}
{green.map(item => <option value={item.Name}>Rank {item.Rank}: {item.Name}</option>)}
</CompareSelect>
<div>
{selected === "This" ? <VisualizationUser /> : <Visualization computer={computer} />}
{selected === "This" ? <VisualizationUser /> : <Visualization computer={selected} />}
</div>

</CompareContainer>
Expand Down
5 changes: 3 additions & 2 deletions src/components/compare/visualization.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Stage, Layer, Path } from "react-konva";
import { equivnum, calcCarbon } from '../logic';
import convs from '../../data/gfgconvs.json';
import images from '../../assets/images/images.json';
import green from '../../data/green500.json';

const VisualizationTitle = styled.h2`
font-weight: bold;
Expand Down Expand Up @@ -63,15 +64,15 @@ const determineTitle = (metric, carbon) => {
}

function Visualization(props) {
const [computer, setComputer] = useState(props.computer);
const [computer, setComputer] = useState(green.find(item => item.Name === props.computer));
const [number, setNumber] = useState(generateShapes(0, 1));
const [metric, setMetric] = useState('smartphones');
const [conversionData, setConversionData] = useState(calcCarbon(computer.Name));
const [data, setData] = useState('M9.5 3H9V1.5a.5.5 0 0 0-1 0V3a1 1 0 0 0 1 1v4.25a.25.25 0 1 1-.5 0V6.5A1.5 1.5 0 0 0 7 5V2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v7a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1V6a.5.5 0 0 1 .5.5v1.75a1.25 1.25 0 1 0 2.5 0V3.5a.5.5 0 0 0-.5-.5zM6 4.5a.49.49 0 0 1-.48.5h-3A.51.51 0 0 1 2 4.5V3a.5.5 0 0 1 .5-.5h3A.5.5 0 0 1 6 3v1.5z');

useEffect(() => {
const image = images.find(img => img.name === metric);
setComputer(props.computer);
setComputer(green.find(item => item.Name === props.computer));
setNumber(generateShapes(Math.ceil(equivnum(metric,conversionData)), image.scale));
setConversionData(calcCarbon(computer.Name))
setData(image.path);
Expand Down

0 comments on commit dc7545f

Please sign in to comment.