NASU41
diff --git a/‎.DS_Store‎
12 KB b/‎.DS_Store‎
12 KB
diff --git a/‎ModInt/.DS_Store‎
6 KB b/‎ModInt/.DS_Store‎
6 KB
diff --git a/‎ModInt/ModInt.java‎
Lines changed: 10 additions & 4 deletions b/‎ModInt/ModInt.java‎
Lines changed: 10 additions & 4 deletions
@@ -43,8 +43,14 @@ public ModInt create(long value) {
     private void prepareFactorial(int max){
         factorial.ensureCapacity(max+1);
         if(factorial.size()==0) factorial.add(1);
-        for(int i=factorial.size(); i<=max; i++){
-            factorial.add(ma.mul(factorial.get(i-1), i));
+        if (usesMontgomery) {
+            for(int i=factorial.size(); i<=max; i++){
+                factorial.add(ma.mul(factorial.get(i-1), maMontgomery.generate(i)));
+            }
+        } else {
+            for(int i=factorial.size(); i<=max; i++){
+                factorial.add(ma.mul(factorial.get(i-1), i));
+            }
         }
     }
 
@@ -77,8 +83,8 @@ public int mod() {
             return mod;
         }
         public int value() {
-            if (ma instanceof ModArithmetic.ModArithmeticMontgomery) {
-                return ((ModArithmetic.ModArithmeticMontgomery) ma).reduce(value);
+            if (usesMontgomery) {
+                return maMontgomery.reduce(value);
             }
             return value;
         }
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,14 @@ public ModInt create(long value) {`
`43`	`43`	`private void prepareFactorial(int max){`
`44`	`44`	`factorial.ensureCapacity(max+1);`
`45`	`45`	`if(factorial.size()==0) factorial.add(1);`
`46`		`- for(int i=factorial.size(); i<=max; i++){`
`47`		`- factorial.add(ma.mul(factorial.get(i-1), i));`
	`46`	`+ if (usesMontgomery) {`
	`47`	`+ for(int i=factorial.size(); i<=max; i++){`
	`48`	`+ factorial.add(ma.mul(factorial.get(i-1), maMontgomery.generate(i)));`
	`49`	`+ }`
	`50`	`+ } else {`
	`51`	`+ for(int i=factorial.size(); i<=max; i++){`
	`52`	`+ factorial.add(ma.mul(factorial.get(i-1), i));`
	`53`	`+ }`
`48`	`54`	`}`
`49`	`55`	`}`
`50`	`56`
`@@ -77,8 +83,8 @@ public int mod() {`
`77`	`83`	`return mod;`
`78`	`84`	`}`
`79`	`85`	`public int value() {`
`80`		`- if (ma instanceof ModArithmetic.ModArithmeticMontgomery) {`
`81`		`- return ((ModArithmetic.ModArithmeticMontgomery) ma).reduce(value);`
	`86`	`+ if (usesMontgomery) {`
	`87`	`+ return maMontgomery.reduce(value);`
`82`	`88`	`}`
`83`	`89`	`return value;`
`84`	`90`	`}`