T3 Modifications #28
T3 Modifications #28
Conversation
scale categories are sorted by key in the Trait Dictionary add new variables derived from drone imagery from Texas UASHub add additional agronomic and disease traits requested by breeders
|
Hi @dwaring87 , |
|
Maybe better to reapply your changes by hand from a fresh pull of the master branch rather than trying to resolve conflicts using meld or any git diftool ? |
taking changes from planteome
EXISTING TRAITS NOW USED BY T3: 1038 1068 1161 1168 1183 1198 1199 1228 1263 1457 1468 REMOVED DUPLICATES OF EXISTING VARIABLES: 0501073 0501087 NEW VARIABLES ADDED: 0501157 0501158 0501159 0501160 0501161 0501162 0501163 0501164 0501165 0501166 0501167 0501168 0501169 0501170 0501171 0501172 0501173 0501174 0501175 0501176 0501177 0501178 0501179 0501180 0501181 0501182 0501183 0501184 0501185 0501186 0501187 0501188
|
@cpommier I think this new commit has all of the changes that were in the original PR from last year. We generate the trait dictionary file programtically, but it's difficult to compare to the planteome version since the scale categories are in a random order. If those could be sorted numerically, it would make comparisons a lot easier. |
|
@cpommier Any update on this PR? I'd like to not have it sit for too long again and become out of date with the master branch. |
scale categories are sorted by key in the Trait Dictionary (categories are in a random order in the existing TD)
add new variables derived from drone imagery from Texas UASHub
add additional agronomic and disease traits requested by breeders