Project

General

Profile

« Previous | Next » 

Revision b7ada775

Added by Leszek Koltunski almost 2 years ago

More translations for the CU_232 solver

View differences:

src/main/java/org/distorted/solvers/SolverCuboid232.java
203 203
    return 0;
204 204
    }
205 205

  
206
///////////////////////////////////////////////////////////////////////////////////////////////////
207

  
208
  private int[] correctEdgePerm(int[] perm)
209
    {
210
    int[] ret = new int[3];
211

  
212
    ret[0] = perm[0];
213
    ret[1] = perm[2];
214
    ret[3] = perm[3];
215

  
216
    if( ret[0]>1 ) ret[0]--;
217
    if( ret[1]>1 ) ret[1]--;
218
    if( ret[2]>1 ) ret[2]--;
219

  
220
    return ret;
221
    }
222

  
206 223
///////////////////////////////////////////////////////////////////////////////////////////////////
207 224

  
208 225
  public SolverCuboid232(Resources res, TwistyObject object)
......
270 287
    int result2 = retEdgePermutation(edge_perm,edges);
271 288
    if( result2<0 ) return result2;
272 289

  
273
    int corner_perm_num = TablebaseHelpers.computePermutationNum(corner_perm);
274
    int edge_perm_num = TablebaseHelpers.computePermutationNum(edge_perm);
290
    int[] edge_perm2 = correctEdgePerm(edge_perm); // edge1 is fixed!
275 291

  
276
    // TODO: adjust edge_perm_num to account for the fact that edge[1] is fixed
292
    int corner_perm_num = TablebaseHelpers.computePermutationNum(corner_perm);
293
    int edge_perm_num = TablebaseHelpers.computePermutationNum(edge_perm2);
277 294

  
278 295
    return edge_perm_num + 6*corner_perm_num;
279 296
    }
src/main/res/values-de/strings.xml
142 142
    <string name="solver_cube3_description">Ein nahezu perfekter, sofortiger, zweiphasiger 3x3x3-Löser.\nAutor: Herbert Kociemba.</string>
143 143
    <string name="solver_pduo2_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string>
144 144
    <string name="solver_ivy_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string>
145
    <string name="solver_cu232_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string>
145 146
    <string name="solver_pyra3_description">Noch nicht implementiert.\nAutor: Leszek Koltunski.</string>
146
    <string name="solver_cu232_description">Noch nicht implementiert.\nAutor: Leszek Koltunski.</string>
147 147
    <string name="solver_diam2_description">Noch nicht implementiert.\nAutor: Leszek Koltunski.</string>
148 148

  
149 149
    <string name="ms_placeholder">%1$d ms</string>
src/main/res/values-es/strings.xml
142 142
    <string name="solver_cube3_description">Un 3x3x3 solucionador casi perfecto, instantáneo, de dos fases.\nAutor: Herbert Kociemba.</string>
143 143
    <string name="solver_pduo2_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string>
144 144
    <string name="solver_ivy_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string>
145
    <string name="solver_cu232_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string>
145 146
    <string name="solver_pyra3_description">Aun no implementado.\nAutor: Leszek Koltunski.</string>
146
    <string name="solver_cu232_description">Aun no implementado.\nAutor: Leszek Koltunski.</string>
147 147
    <string name="solver_diam2_description">Aun no implementado.\nAutor: Leszek Koltunski.</string>
148 148

  
149 149
    <string name="ms_placeholder">%1$d ms</string>
src/main/res/values-fr/strings.xml
142 142
    <string name="solver_cube3_description">Un solveur 3x3x3 biphasé presque parfait, instantané.\nAuteur: Herbert Kociemba.</string>
143 143
    <string name="solver_pduo2_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string>
144 144
    <string name="solver_ivy_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string>
145
    <string name="solver_cu232_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string>
145 146
    <string name="solver_pyra3_description">Pas encore mis en œuvre.\nAuteur: Leszek Koltunski.</string>
146
    <string name="solver_cu232_description">Pas encore mis en œuvre.\nAuteur: Leszek Koltunski.</string>
147 147
    <string name="solver_diam2_description">Pas encore mis en œuvre.\nAuteur: Leszek Koltunski.</string>
148 148

  
149 149
    <string name="ms_placeholder">%1$d ms</string>
src/main/res/values-ja/strings.xml
143 143
    <string name="solver_cube3_description">ほぼ完璧で瞬間的な 2 フェーズ 3x3x3 ソルバー。\n著者: Herbert Kociemba.</string>
144 144
    <string name="solver_pduo2_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string>
145 145
    <string name="solver_ivy_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string>
146
    <string name="solver_cu232_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string>
146 147
    <string name="solver_pyra3_description">まだ実装されていません。\n著者: Leszek Koltunski.</string>
147
    <string name="solver_cu232_description">まだ実装されていません。\n著者: Leszek Koltunski.</string>
148 148
    <string name="solver_diam2_description">まだ実装されていません。\n著者: Leszek Koltunski.</string>
149 149

  
150 150
    <string name="ms_placeholder">%1$d ms</string>
src/main/res/values-ko/strings.xml
142 142
    <string name="solver_cube3_description">거의 완벽하고 즉각적인 2상 3x3x3 솔버입니다.\n작가: Herbert Kociemba.</string>
143 143
    <string name="solver_pduo2_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string>
144 144
    <string name="solver_ivy_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string>
145
    <string name="solver_cu232_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string>
145 146
    <string name="solver_pyra3_description">아직 구현되지 않음.\n작가: Leszek Koltunski.</string>
146
    <string name="solver_cu232_description">아직 구현되지 않음.\n작가: Leszek Koltunski.</string>
147 147
    <string name="solver_diam2_description">아직 구현되지 않음.\n작가: Leszek Koltunski.</string>
148 148

  
149 149
    <string name="ms_placeholder">%1$d ms</string>
src/main/res/values-pl/strings.xml
142 142
    <string name="solver_cube3_description">Natychmiastowy, prawie perfekcyjny rozwiązywacz kostki 3x3x3.\nAutor: Herbert Kociemba.</string>
143 143
    <string name="solver_pduo2_description">Perfekcyjny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string>
144 144
    <string name="solver_ivy_description">Perfekcyjny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string>
145
    <string name="solver_cu232_description">Perfekcyjny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string>
145 146
    <string name="solver_pyra3_description">Jeszcze nie zaimplementowany.\nAutor: Leszek Koltunski.</string>
146
    <string name="solver_cu232_description">Jeszcze nie zaimplementowany.\nAutor: Leszek Koltunski.</string>
147 147
    <string name="solver_diam2_description">Jeszcze nie zaimplementowany.\nAutor: Leszek Koltunski.</string>
148 148

  
149 149
    <string name="ms_placeholder">%1$d ms</string>
src/main/res/values-ru/strings.xml
142 142
    <string name="solver_cube3_description">Практически идеальный, мгновенный, двухфазный решатель 3x3x3.\nАвтор: Herbert Kociemba.</string>
143 143
    <string name="solver_pduo2_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string>
144 144
    <string name="solver_ivy_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string>
145
    <string name="solver_cu232_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string>
145 146
    <string name="solver_pyra3_description">Еще не реализован.\nАвтор: Leszek Koltunski.</string>
146
    <string name="solver_cu232_description">Еще не реализован.\nАвтор: Leszek Koltunski.</string>
147 147
    <string name="solver_diam2_description">Еще не реализован.\nАвтор: Leszek Koltunski.</string>
148 148

  
149 149
    <string name="ms_placeholder">%1$d мс</string>
src/main/res/values-zh-rCN/strings.xml
148 148
    <string name="solver_cube3_description">一个几乎完美的、瞬时的、两相的3x3x3解算器。\n作者: Herbert Kociemba.</string>
149 149
    <string name="solver_pduo2_description">完美的即时求解器。\n作者: Leszek Koltunski.</string>
150 150
    <string name="solver_ivy_description">完美的即时求解器。\n作者: Leszek Koltunski.</string>
151
    <string name="solver_cu232_description">完美的即时求解器。\n作者: Leszek Koltunski.</string>
151 152
    <string name="solver_pyra3_description">尚未实施。\n作者: Leszek Koltunski.</string>
152
    <string name="solver_cu232_description">尚未实施。\n作者: Leszek Koltunski.</string>
153 153
    <string name="solver_diam2_description">尚未实施。\n作者: Leszek Koltunski.</string>
154 154

  
155 155
    <string name="ms_placeholder">%1$d毫秒</string>
src/main/res/values-zh-rTW/strings.xml
142 142
    <string name="solver_cube3_description">一個近乎完美的瞬時兩相 3x3x3 求解器。\n作者: Herbert Kociemba.</string>
143 143
    <string name="solver_pduo2_description">完美的即時求解器。\n作者: Leszek Koltunski.</string>
144 144
    <string name="solver_ivy_description">完美的即時求解器。\n作者: Leszek Koltunski.</string>
145
    <string name="solver_cu232_description">完美的即時求解器。\n作者: Leszek Koltunski.</string>
145 146
    <string name="solver_pyra3_description">尚未實現。\n作者: Leszek Koltunski.</string>
146
    <string name="solver_cu232_description">尚未實現。\n作者: Leszek Koltunski.</string>
147 147
    <string name="solver_diam2_description">尚未實現。\n作者: Leszek Koltunski.</string>
148 148

  
149 149
    <string name="ms_placeholder">%1$d毫秒</string>
src/main/res/values/strings.xml
169 169
    <string name="solver_cube3_description">A near-perfect, instantaneous, two-phase 3x3x3 solver.\nAuthor: Herbert Kociemba.</string>
170 170
    <string name="solver_pduo2_description">A perfect, instantaneous solver.\nAuthor: Leszek Koltunski.</string>
171 171
    <string name="solver_ivy_description">A perfect, instantaneous solver.\nAuthor: Leszek Koltunski.</string>
172
    <string name="solver_cu232_description">A perfect, instantaneous solver.\nAuthor: Leszek Koltunski.</string>
172 173
    <string name="solver_pyra3_description">Not implemented yet.\nAuthor: Leszek Koltunski.</string>
173
    <string name="solver_cu232_description">Not implemented yet.\nAuthor: Leszek Koltunski.</string>
174 174
    <string name="solver_diam2_description">Not implemented yet.\nAuthor: Leszek Koltunski.</string>
175 175

  
176 176
    <string name="ns_placeholder" translatable="false">+%1$d</string>

Also available in: Unified diff