search

mp-interns / eratosthenes

Intelligent sieving of material candidates for the computationally budget-conscious
BSD 2-Clause "Simplified" License
0 stars 2 forks source link

removed scaffold, added encoding scripts #13

Closed HGeerlings closed 9 years ago

HGeerlings commented 9 years ago

I removed the ga_scaffold.py script (does not seem relevant) and added a directory Encode_WS_Data. This directory has a couple of scripts that both encode, and decode the perovskite data in the same way as the water splitting paper mentioned. I only added the Ivano_perovskite_data so that the scripts can be run straight out of the box (they require the data directory to be in the same directory). The fitness related scripts are the same as those from the ga_opt_ternary repo, and will most likely eventually be used for evaluating design fitness for use with MOE.

dwinston commented 9 years ago

Let's keep the 19,000 data files outside of the repo. We don't really "own" the data like we own the code, so we don't want to distribute it. You can add an entry to the .gitignore file to make this so.

HGeerlings commented 9 years ago

That's true, I was slightly unsure of how/if to push those. Since we all have access to the database on our machines I'll go ahead and just remove that folder from the request and resubmit. Would that be alright?

Thanks, Henry

On Fri, Jul 10, 2015 at 11:18 AM, Donny Winston notifications@github.com wrote:

Let's keep the 19,000 data files outside of the repo. We don't really "own" the data like we own the code, so we don't want to distribute it. You can add an entry to the .gitignore file to make this so.

— Reply to this email directly or view it on GitHub https://github.com/mp-interns/eratosthenes/pull/13#issuecomment-120485076 .

dwinston commented 9 years ago

Sure. You may need to git reset or something to make sure you're not still adding the files. It might be best to make a new branch from mp-interns:master, add only the files you want to commit, and submit a new pull request from that branch.

git checkout upsteam/master
git checkout -b mynewbranch
# make changes
git add ...
git commit ...
git push ...
tschaume commented 9 years ago

This gist might also help if removal and history rewrite are desired.