X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=problems.py;fp=problems.py;h=675a47ae5e86ebe3df318cb653a98503ba930eba;hb=b108aef212afc9b37ece29bea44f35b8686aac02;hp=51e90ed53237d25466f382e1cb101542b20999a3;hpb=559a50b8cd74180311d3347254c9cc84b794afa2;p=picoclvr.git diff --git a/problems.py b/problems.py index 51e90ed..675a47a 100755 --- a/problems.py +++ b/problems.py @@ -308,7 +308,7 @@ class ProblemMixing(Problem): x = x.flatten(1) u = torch.arange(self.height * self.width).reshape(1, -1) m = ((x - u).abs() == 0).long() - d = (x - (m * u + (1-m) * self.height * self.width)).abs().sum(-1) + ( + d = (x - (m * u + (1 - m) * self.height * self.width)).abs().sum(-1) + ( m.sum(dim=-1) != self.height * self.width // 2 ).long() return d @@ -386,7 +386,7 @@ class ProblemMixing(Problem): #################### if __name__ == "__main__": - p = ProblemMixing(width=4, hard=True) + p = ProblemMixing() s, m = p.generate_sequences(10000) for x in s[:5]: print(p.seq2str(x))