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

Cost Opimization #29

Merged
merged 17 commits into from
Aug 15, 2018
Merged

Cost Opimization #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
96208fb
Implemented multi-objective sort, don't pull this yet as package supp…
walkeri Aug 4, 2018
1a7eb3d
Connected to database
walkeri Aug 8, 2018
6d6f7e6
Database is up and running, still do not pull
walkeri Aug 9, 2018
465415a
Database is up and running, visualization is MVP
walkeri Aug 10, 2018
1628b17
The learn more page is now in progress, also decreased computation ti…
walkeri Aug 11, 2018
0ed63db
setup backend to send cost info to frontend
walkeri Aug 13, 2018
80b7925
Fixed a divide by 0 in the cost function, added breakdown of cost int…
walkeri Aug 14, 2018
f913356
Cleaned the frontend up a lot, the dashboard is now fully functional
walkeri Aug 14, 2018
e2126b3
working commit
walkeri Aug 15, 2018
355a5a6
Merge branch 'param-config' of https://github.com/ParadigmHyperloop/R…
walkeri Aug 15, 2018
c06960c
Config file can be changed without rebuilding, allowing for iterative…
walkeri Aug 15, 2018
6c93c27
Merge pull request #28 from ParadigmHyperloop/param-config
walkeri Aug 15, 2018
95ae608
attempt to fix build
walkeri Aug 15, 2018
f7cdecb
Removed Pagmo and probably got travis to work
walkeri Aug 15, 2018
6b3b83c
changed travis permissions slightly
walkeri Aug 15, 2018
9a810ef
fixed a type in travis.sh
walkeri Aug 15, 2018
6f5927d
Fixed more typos
walkeri Aug 15, 2018
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
Prev Previous commit
Next Next commit
working commit
  • Loading branch information
@walkeri
walkeri committed Aug 15, 2018
commit e2126b3b5827b59ddeed0b29b0b86666a30f5ea8
31 changes: 18 additions & 13 deletions htdocs/route.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<br>
Travel time: <div id="time" class="grad-text"></div></div>

<div class="button-container" id="learn-more-container" onclick="fadeOverlay()">
<div class="button-container" id="learn-more-container" onclick="showRoute()">
<div class="button">
<div class="button-text" id="learn-more-text">
See my route
Expand Down Expand Up @@ -130,21 +130,26 @@



<div class="button-container-transparent" id="see-stats-container" onclick="showStats()">
<div class="button">
<div class="button-text" id="see-stats-text">
Show stats
</div>
</div>
</div>
<div id="map-buttons">

<div class="button-container-transparent" id="see-stats-container" onclick="showGraphs()">
<div class="button">
<div class="button-text" id="see-graphs-text">
Show Graphs
</div>
<div class="button-container-transparent" id="see-stats-container" onclick="showStats()">
<div class="button">
<div class="button-text" id="see-stats-text">
Show Stats
</div>
</div>
</div>

<div class="button-container-transparent" id="dashboard-container" onclick="showGraphs()">
<div class="button">
<div class="button-text" id="see-graphs-text">
Show Graphs
</div>
</div>
</div>

</div>




Expand Down
24 changes: 16 additions & 8 deletions htdocs/script/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,19 +291,26 @@ function fadeOverlay() {

$('#overlay').css({"opacity": 0})
$('#map-container').css({"display": "flex", "opacity" : "100"})
$('#left-map-graphs').css({"display": "flex", "opacity" : "0"})
$('#right-map-graphs').css({"display": "flex", "opacity" : "0"})
$('#dashboard-container').css({"opacity" : "0"});
$('#dashboard-container').prop('disabled', true);



setTimeout(hideOverlay, 800)

zoomToRoute();

}

function showRoute() {

generation = numGenerations - 1;
$('#left-map-graphs').css({"display": "flex", "opacity" : "0"})
$('#right-map-graphs').css({"display": "flex", "opacity" : "0"})
$('#dashboard-container').css({"opacity" : "0"});
$('#dashboard-container').prop('disabled', true);
$('#see-stats-container').css({"opacity" : "100"});
fadeOverlay();
updateMap();

}

function hideOverlay() {

$('#overlay').css({"display": "none"})
Expand Down Expand Up @@ -440,13 +447,14 @@ function fancyLengthFormat(length) {
}

function startVisualization() {
fadeOverlay();
generation = 0;
updateMap();
initGraphs();
$('#map-container').css({"display": "flex", "opacity" : "100"});
fadeOverlay();
$('#dashboard-container').css({ "opacity" : "100"});
$('#dashboard-container').prop('disabled', false);
$('#see-stats-container').css({ "opacity" : "100"});



// $('#left-map-graphs').css({"display": "flex", "opacity" : "100"})
Expand Down
30 changes: 24 additions & 6 deletions htdocs/style/route.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,21 @@ html {
background-color: transparent;
}

#map-buttons {
position: absolute;
display: table;
margin-top: auto;
margin-bottom: auto;
width: 25%;
height: 10%;
top: 0;
left: 0;
white-space: nowrap;
background-color: transparent;
}

#see-stats-container {
-webkit-appearance: none;
position: absolute;
display: table;
width: 7%;
Expand All @@ -42,17 +56,17 @@ html {
left: 0;
white-space: nowrap;
background-color: transparent;

}

#dashboard-container {
-webkit-appearance: none;
position: absolute;
display: table;
width: 2%;
height: 3.2%;
margin-top: auto;
margin-bottom: auto;
top: 10%;
top: 100%;
left: 0;
white-space: nowrap;
background-color: transparent;
Expand Down Expand Up @@ -179,25 +193,25 @@ html {
}

#track {
right: 100%;
right: 95%;
top: 0;
float: right;
}

#curve {
right: 100%;
right: 95%;
top: 25%;
float: right;
}

#grade {
right: 100%;
right: 95%;
top: 50%;
float: right;
}

#length {
right: 100%;
right: 95%;
top: 75%;
float: right;
}
Expand Down Expand Up @@ -227,5 +241,9 @@ html {

}

#see-graphs-text {
font-size: 23.2px;
}



7 changes: 2 additions & 5 deletions opencl/kernel_cost.opencl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,8 @@ __kernel void mo(__read_only image2d_t image, __global float4* individuals, int
float below_cost = (-fabs(pylon_height + excavation_depth) + pylon_height + excavation_depth);
float below_cost_den = 2.0 * pylon_height + 2.0 * (excavation_depth);

if (below_cost_den == 0) {
below_cost = (below_cost) * tunnel_cost;
} else {
below_cost = (below_cost / below_cost_den) * tunnel_cost;
}
below_cost = below_cost_den == 0 ? 1.0 : (below_cost / below_cost_den) * tunnel_cost;

track_cost += (above_cost + below_cost) * spacing;

if (isnan(track_cost)) {
Expand Down
2 changes: 1 addition & 1 deletion src/routes-lib/genetics/population.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ glm::vec4 Population::getFitness() const {

double Population::totalFitness(glm::vec4 costs) {

return costs.x * 1.2 + costs.y * 1.3 + costs.z + costs.w * 2.0;
return costs.x * 1.2 + costs.y * 0.8 + costs.z + costs.w * 1.5;

}

Expand Down
2 changes: 1 addition & 1 deletion src/routes-lib/routes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define POP_SIZE 1000

/** The default number of generations that the population should be bred for */
#define NUM_GENERATIONS 300
#define NUM_GENERATIONS 600

/** This is a simplelass to handle the complete calculation of a route. */
class Routes {
Expand Down