Fs/jquinn (Sourcery refactored) #42

sourcery-ai · 2022-12-31T19:17:01Z

Pull Request #41 refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the fs/jquinn branch, then run:

git fetch origin sourcery/fs/jquinn
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai

Due to GitHub API limits, only the first 60 comments can be shown.

sourcery-ai · 2022-12-31T19:17:23Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 0.32%.

Quality metrics	Before	After	Change
Complexity	26.79 😞	25.57 😞	-1.22 👍
Method Length	85.75 🙂	85.29 🙂	-0.46 👍
Working memory	10.84 😞	10.81 😞	-0.03 👍
Quality	51.43% 🙂	51.75% 🙂	0.32% 👍

Other metrics	Before	After	Change
Lines	3586	3551	-35

Changed files	Quality Before	Quality After	Quality Change
dataClasses.py	77.39% ⭐	77.44% ⭐	0.05% 👍
methods.py	43.57% 😞	44.18% 😞	0.61% 👍
stratFunctions.py	88.25% ⭐	90.12% ⭐	1.87% 👍
voterModels.py	75.19% ⭐	75.19% ⭐	0.00%
vse.py	25.94% 😞	25.87% 😞	-0.07% 👎

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
methods.py	V321.stratBallotFor	52 ⛔	469 ⛔		5.23% ⛔	Refactor to reduce nesting. Try splitting into smaller methods
vse.py	threeRoundResults	39 ⛔	1126 ⛔	34 ⛔	6.32% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
methods.py	makeSTARMethod	157 ⛔	1284 ⛔	16 ⛔	7.41% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
methods.py	makeScoreMethod	54 ⛔	829 ⛔	15 😞	11.06% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
methods.py	V321.results	11 🙂	342 ⛔	16 ⛔	32.45% 😞	Try splitting into smaller methods. Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Help us improve this quality report!

sourcery-ai

Due to GitHub API limits, only the first 60 comments can be shown.

sourcery-ai · 2022-12-31T19:22:37Z

ballotEval.py

-    for i in range(niter):
+    for _ in range(niter):


Function stratStats refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-12-31T19:22:37Z

cid.py

-        pollErrors = [random.gauss(0, pollingError/2) for i in range(numCands)]
+        pollErrors = [random.gauss(0, pollingError/2) for _ in range(numCands)]


Function influentialBlocs refactored with the following changes:

Replace unused for index with underscore [×2] (for-index-underscore)

sourcery-ai · 2022-12-31T19:22:38Z

cid.py

-        self.mNames = [m[0].__name__ + ':' + m[1].__name__ + str(m[2]) for m in ms]
+        self.mNames = [f'{m[0].__name__}:{m[1].__name__}{str(m[2])}' for m in ms]


Function CID.__init__ refactored with the following changes:

Use f-string instead of string concatenation [×3] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-31T19:22:38Z

cid.py

-            incentFracts = {re.match(".*(?=:)", name).group(0): data for name, data in incentFracts.items()}
+            incentFracts = {
+                re.match(".*(?=:)", name)[0]: data
+                for name, data in incentFracts.items()
+            }


Function CID.chart refactored with the following changes:

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

sourcery-ai · 2022-12-31T19:22:38Z

cid.py

-        myFile = open(baseName + (str(i) if newFile else "") + ".csv", "w")
-        dw = csv.DictWriter(myFile, fields, restval="data missing")
-        dw.writeheader()
-        for outcome, index in resultTypeIndices.items():
-            for name, results in self.summarize()[index].items():
-                row = {'name': name, 'baseResult': outcome}
-                row.update({i: result for i, result in enumerate(results)})
-                row.update(universalInfo)
-                dw.writerow(row)
-        myFile.close()
+        with open(baseName + (str(i) if newFile else "") + ".csv", "w") as myFile:
+            dw = csv.DictWriter(myFile, fields, restval="data missing")
+            dw.writeheader()
+            for outcome, index in resultTypeIndices.items():
+                for name, results in self.summarize()[index].items():
+                    row = (
+                        {'name': name, 'baseResult': outcome}
+                        | enumerate(results)
+                        | universalInfo
+                    )
+                    dw.writerow(row)


Function CID.saveFile refactored with the following changes:

Use with when opening file to ensure closure (ensure-file-closed)

Merge dictionary updates via the union operator [×4] (dict-assign-update-to-union)

Replace identity comprehension with call to collection constructor (identity-comprehension)

Remove a redundant constructor in a dictionary union (remove-redundant-constructor-in-dict-union)

sourcery-ai · 2022-12-31T19:22:39Z

dataClasses.py

-    results = {c: kw.get(c, None) for c in resultColumns}
-    results.update(kw)
-    return results
+    return {c: kw.get(c, None) for c in resultColumns} | kw


Function makeResults refactored with the following changes:

Merge dictionary updates via the union operator [×2] (dict-assign-update-to-union)

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-12-31T19:22:39Z

dataClasses.py

-    if False and len(polls) < 6:
-        return tieFor2Probs(polls, uncertainty)
-    else:
-        return tieFor2Estimate(tuple(pollsToProbs(polls, uncertainty)))
+    return tieFor2Estimate(tuple(pollsToProbs(polls, uncertainty)))


Function adaptiveTieFor2 refactored with the following changes:

Remove redundant conditional (remove-redundant-if)

sourcery-ai · 2022-12-31T19:22:39Z

dataClasses.py

-            print("# " + str(globalComment),
-            #dict(
-                        #media=self.media.__name__,
-            #              version=self.repo_version,
-            #              seed=self.seed,
-            ##              model=self.model,
-            #              methods=self.methods,
-            #              nvot=self.nvot,
-            #              ncand=self.ncand,
-            #              niter=self.niter)),
-                file=myFile)
+            print(f"# {str(globalComment)}", file=myFile)


Function appendResults refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

This removes the following comments ( why? ):

#media=self.media.__name__, # niter=self.niter)), #dict( ## model=self.model, # nvot=self.nvot, # version=self.repo_version, # seed=self.seed, # methods=self.methods, # ncand=self.ncand,

sourcery-ai · 2022-12-31T19:22:39Z

methods.py

-    Top2Version.__name__ = noRunoffMethod.__name__ + "Top2"
+    Top2Version.__name__ = f"{noRunoffMethod.__name__}Top2"


Function top2 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-12-31T19:22:39Z

methods.py

+
+

Function makeScoreMethod refactored with the following changes:

Simplify generator expression (simplify-generator)

sourcery-ai · 2022-12-31T19:22:43Z

methods.py

-        expectedUtility = sum(u for u in utils)/len(utils)
+        expectedUtility = sum(utils) / len(utils)


Function Approval.zeroInfoBallot refactored with the following changes:

Simplify generator expression (simplify-generator)

sourcery-ai · 2022-12-31T19:22:43Z

methods.py

-            #minF, maxF = min(winner, runnerUp), max(winner, runnerUp)
-            #thirdProbs = pollsToProbs(
-                    #electabilities[:minF] + electabilities[minF+1:maxF] + electabilities[maxF+1:], pollingUncertainty)
            for third in range(nCands):
-                if third == winner or third == runnerUp:
+                if third in [winner, runnerUp]:


Function getCoefficients refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

This removes the following comments ( why? ):

#thirdProbs = pollsToProbs( #electabilities[:minF] + electabilities[minF+1:maxF] + electabilities[maxF+1:], pollingUncertainty) #minF, maxF = min(winner, runnerUp), max(winner, runnerUp)

sourcery-ai · 2022-12-31T19:22:43Z

methods.py

+

Function makeSTARMethod refactored with the following changes:

Replace if statement with if expression [×5] (assign-if-exp)

Remove redundant conditional [×2] (remove-redundant-if)

Lift code into else after jump in control flow (reintroduce-else)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-12-31T19:22:44Z

methods.py

-    def candScore(self, scores):
+    def candScore(cls, scores):


Function Mav.candScore refactored with the following changes:

The first argument to class methods should be cls (class-method-first-arg-name)

sourcery-ai · 2022-12-31T19:22:44Z

methods.py

-        ((frontId,frontResult), (targId, targResult)) = places[0:2]
+        ((frontId,frontResult), (targId, targResult)) = places[:2]


Function Mav.stratBallot refactored with the following changes:

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2022-12-31T19:22:45Z

methods.py

-        matchupWins = [sum(1 for marg in row if marg > 0) for row in cmat]
+        matchupWins = [sum(marg > 0 for marg in row) for row in cmat]


Function RankedRobin.results refactored with the following changes:

Simplify constant sum() call (simplify-constant-sum)

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

sourcery-ai · 2022-12-31T19:22:45Z

methods.py

-            for i, b in enumerate(ballots):
+            for b in ballots:


Function ITRV.results refactored with the following changes:

Remove unnecessary calls to enumerate when the index is not used (remove-unused-enumerate)

sourcery-ai · 2022-12-31T19:22:45Z

mwmethods.py

@@ -2,6 +2,7 @@
 from methods import *

 def makeBlock(method):
+


Function makeBlock refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-12-31T19:22:45Z

mwmethods.py

-            scoreSupport = 0
-            for ballot in ballots:
-                if ballot[winner] == score:
-                    scoreSupport += ballot.weight
+            scoreSupport = sum(
+                ballot.weight for ballot in ballots if ballot[winner] == score
+            )


Function AllocatedScore.reweight refactored with the following changes:

Convert for loop into call to sum() (sum-comprehension)

sourcery-ai · 2022-12-31T19:22:45Z

mwmethods.py

-        if upset > 0:
-            return runnerUp
-        else: return top
+        return runnerUp if upset > 0 else top


Function ASFinalRunoff.pickWinner refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-12-31T19:22:49Z

mwmethods.py

-        if upset > 0:
-            return runnerUp
-        else: return top
+        return runnerUp if upset > 0 else top


Function ASRunoffs.pickWinner refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-12-31T19:22:49Z

mwmethods.py

-        else:
-            scores = [sum(ballot[c]*ballot.weight for ballot in ballots) if c in bestCands else -1 for c in range(ncand)]
-            return scores.index(max(scores))
+        scores = [sum(ballot[c]*ballot.weight for ballot in ballots) if c in bestCands else -1 for c in range(ncand)]
+        return scores.index(max(scores))


Function SequentialMonroe.pickWinner refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2022-12-31T19:22:49Z

mwmethods.py

-            scoreSupport = 0
-            for ballot in ballots:
-                if ballot[winner] == score:
-                    scoreSupport += score*ballot.weight
+            scoreSupport = sum(
+                score * ballot.weight
+                for ballot in ballots
+                if ballot[winner] == score
+            )


Function S5H.reweight refactored with the following changes:

Convert for loop into call to sum() (sum-comprehension)

sourcery-ai · 2022-12-31T19:22:49Z

mwmethods.py

-        piles = [[] for i in range(nCands)]
+        piles = [[] for _ in range(nCands)]
        while len(winners) + len(candsLeft) > numWinners:
            cls.resort(ballotsToSort, candsLeft, piles)
-            newWinners = [c for c in candsLeft if sum(b.weight for b in piles[c]) >= quota]
-            if newWinners:
+            if newWinners := [
+                c for c in candsLeft if sum(b.weight for b in piles[c]) >= quota
+            ]:


Function STV.winnerSet refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

Use named expression to simplify assignment and conditional (use-named-expression)

Replace a for append loop with list extend (for-append-to-extend)

Simplify generator expression (simplify-generator)

sourcery-ai · 2022-12-31T19:22:49Z

mwmethods.py

-        piles = [[] for i in range(nCands)]
+        piles = [[] for _ in range(nCands)]
        while len(winners) < numWinners - 1 and len(winners) + len(candsLeft) > numWinners - 1:
            cls.resort(ballotsToSort, candsLeft, piles)
-            newWinners = [c for c in candsLeft if sum(b.weight for b in piles[c]) >= quota][:max(0, numWinners-len(winners)-1)]
-            if newWinners:
+            if newWinners := [
+                c for c in candsLeft if sum(b.weight for b in piles[c]) >= quota
+            ][: max(0, numWinners - len(winners) - 1)]:


Function MinimaxSTV.winnerSet refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

Use named expression to simplify assignment and conditional (use-named-expression)

Replace a for append loop with list extend (for-append-to-extend)

Simplify generator expression (simplify-generator)

sourcery-ai · 2022-12-31T19:22:51Z

stratFunctions.py

-        if callable(biaser):
-            bias = biaser(standings)
-        else:
-            bias = biaser
-        result= (standings[0:2] +
-                 [(standing - bias + numerator * (bias / max(i+2, 1)))
-                        for i, standing in enumerate(standings[2:])])
+        bias = biaser(standings) if callable(biaser) else biaser
+        result = standings[:2] + [
+            (standing - bias + numerator * (bias / max(i + 2, 1)))
+            for i, standing in enumerate(standings[2:])
+        ]


Function biasedMediaFor refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

sourcery-ai · 2022-12-31T19:22:51Z

stratFunctions.py

-        if callable(biaser):
-            bias = biaser(standings)
-        else:
-            bias = biaser
+        bias = biaser(standings) if callable(biaser) else biaser


Function skewedMediaFor refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-12-31T19:22:51Z

voterModels.py

-        if caring==None:
+        if caring is None:


Function DimVoter.fromDims refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2022-12-31T19:22:51Z

voterModels.py

-                subclusterMeans.append([random.gauss(0,sqrt(cares)) for i in range(self.dimsPerView[c])])
+                subclusterMeans.append(
+                    [
+                        random.gauss(0, sqrt(cares))
+                        for _ in range(self.dimsPerView[c])
+                    ]
+                )


Function KSElectorate.chooseClusters refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-12-31T19:22:52Z

vse.py

+    fgHelped = []
+    fgHarmed = []


Function threeRoundResults refactored with the following changes:

Hoist statements out of for/while loops (hoist-statement-from-loop)

Replace if statement with if expression (assign-if-exp)

Merge dictionary updates via the union operator (dict-assign-update-to-union)

This removes the following comments ( why? ):

#If not I should be quitting earlier than this but easier to just fake it. #zero-sized foreground

sourcery-ai

Due to GitHub API limits, only the first 60 comments can be shown.

sourcery-ai · 2022-12-31T23:20:24Z

ballotEval.py

-    for i in range(niter):
+    for _ in range(niter):


Function stratStats refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-12-31T23:20:25Z

cid.py

-        pollErrors = [random.gauss(0, pollingError/2) for i in range(numCands)]
+        pollErrors = [random.gauss(0, pollingError/2) for _ in range(numCands)]


Function influentialBlocs refactored with the following changes:

Replace unused for index with underscore [×2] (for-index-underscore)

sourcery-ai · 2022-12-31T23:20:25Z

cid.py

-        self.mNames = [m[0].__name__ + ':' + m[1].__name__ + str(m[2]) for m in ms]
+        self.mNames = [f'{m[0].__name__}:{m[1].__name__}{str(m[2])}' for m in ms]


Function CID.__init__ refactored with the following changes:

Use f-string instead of string concatenation [×3] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-31T23:20:25Z

cid.py

-            incentFracts = {re.match(".*(?=:)", name).group(0): data for name, data in incentFracts.items()}
+            incentFracts = {
+                re.match(".*(?=:)", name)[0]: data
+                for name, data in incentFracts.items()
+            }


Function CID.chart refactored with the following changes:

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

sourcery-ai · 2022-12-31T23:20:25Z

cid.py

-        myFile = open(baseName + (str(i) if newFile else "") + ".csv", "w")
-        dw = csv.DictWriter(myFile, fields, restval="data missing")
-        dw.writeheader()
-        for outcome, index in resultTypeIndices.items():
-            for name, results in self.summarize()[index].items():
-                row = {'name': name, 'baseResult': outcome}
-                row.update({i: result for i, result in enumerate(results)})
-                row.update(universalInfo)
-                dw.writerow(row)
-        myFile.close()
+        with open(baseName + (str(i) if newFile else "") + ".csv", "w") as myFile:
+            dw = csv.DictWriter(myFile, fields, restval="data missing")
+            dw.writeheader()
+            for outcome, index in resultTypeIndices.items():
+                for name, results in self.summarize()[index].items():
+                    row = (
+                        {'name': name, 'baseResult': outcome}
+                        | enumerate(results)
+                        | universalInfo
+                    )
+                    dw.writerow(row)


Function CID.saveFile refactored with the following changes:

Use with when opening file to ensure closure (ensure-file-closed)

Merge dictionary updates via the union operator [×4] (dict-assign-update-to-union)

Replace identity comprehension with call to collection constructor (identity-comprehension)

Remove a redundant constructor in a dictionary union (remove-redundant-constructor-in-dict-union)

sourcery-ai · 2022-12-31T23:20:26Z

dataClasses.py

-    results = {c: kw.get(c, None) for c in resultColumns}
-    results.update(kw)
-    return results
+    return {c: kw.get(c, None) for c in resultColumns} | kw


Function makeResults refactored with the following changes:

Merge dictionary updates via the union operator [×2] (dict-assign-update-to-union)

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-12-31T23:20:26Z

dataClasses.py

-    if False and len(polls) < 6:
-        return tieFor2Probs(polls, uncertainty)
-    else:
-        return tieFor2Estimate(tuple(pollsToProbs(polls, uncertainty)))
+    return tieFor2Estimate(tuple(pollsToProbs(polls, uncertainty)))


Function adaptiveTieFor2 refactored with the following changes:

Remove redundant conditional (remove-redundant-if)

sourcery-ai · 2022-12-31T23:20:26Z

dataClasses.py

-            print(
-                "# " + str(globalComment),
-                # dict(
-                # media=self.media.__name__,
-                #              version=self.repo_version,
-                #              seed=self.seed,
-                ##              model=self.model,
-                #              methods=self.methods,
-                #              nvot=self.nvot,
-                #              ncand=self.ncand,
-                #              niter=self.niter)),
-                file=myFile,
-            )
+            print(f"# {str(globalComment)}", file=myFile)


Function appendResults refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

This removes the following comments ( why? ):

# version=self.repo_version, # seed=self.seed, # media=self.media.__name__, # niter=self.niter)), # dict( # nvot=self.nvot, # ncand=self.ncand, # methods=self.methods, ## model=self.model,

sourcery-ai · 2022-12-31T23:20:26Z

methods.py

-    Top2Version.__name__ = noRunoffMethod.__name__ + "Top2"
+    Top2Version.__name__ = f"{noRunoffMethod.__name__}Top2"


Function top2 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-12-31T23:20:26Z

methods.py

+
+
+


Function makeScoreMethod refactored with the following changes:

Simplify generator expression (simplify-generator)

sourcery-ai · 2022-12-31T23:20:30Z

methods.py

-        expectedUtility = sum(u for u in utils) / len(utils)
+        expectedUtility = sum(utils) / len(utils)


Function Approval.zeroInfoBallot refactored with the following changes:

Simplify generator expression (simplify-generator)

sourcery-ai · 2022-12-31T23:20:30Z

methods.py

-                if third == winner or third == runnerUp:
+                if third in [winner, runnerUp]:


Function getCoefficients refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2022-12-31T23:20:30Z

methods.py

+

Function makeSTARMethod refactored with the following changes:

Replace if statement with if expression [×5] (assign-if-exp)

Remove redundant conditional [×2] (remove-redundant-if)

Lift code into else after jump in control flow (reintroduce-else)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-12-31T23:20:30Z

methods.py

-    def candScore(self, scores):
+    def candScore(cls, scores):


Function Mav.candScore refactored with the following changes:

The first argument to class methods should be cls (class-method-first-arg-name)

sourcery-ai · 2022-12-31T23:20:30Z

methods.py

-        ((frontId, frontResult), (targId, targResult)) = places[0:2]
+        ((frontId, frontResult), (targId, targResult)) = places[:2]


Function Mav.stratBallot refactored with the following changes:

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2022-12-31T23:20:32Z

methods.py

-        matchupWins = [sum(1 for marg in row if marg > 0) for row in cmat]
+        matchupWins = [sum(marg > 0 for marg in row) for row in cmat]


Function RankedRobin.results refactored with the following changes:

Simplify constant sum() call (simplify-constant-sum)

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

sourcery-ai · 2022-12-31T23:20:32Z

methods.py

-            for i, b in enumerate(ballots):
+            for b in ballots:


Function ITRV.results refactored with the following changes:

Remove unnecessary calls to enumerate when the index is not used (remove-unused-enumerate)

sourcery-ai · 2022-12-31T23:20:32Z

mwmethods.py

@@ -2,6 +2,7 @@
 from methods import *

 def makeBlock(method):
+


Function makeBlock refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-12-31T23:20:32Z

mwmethods.py

-            scoreSupport = 0
-            for ballot in ballots:
-                if ballot[winner] == score:
-                    scoreSupport += ballot.weight
+            scoreSupport = sum(
+                ballot.weight for ballot in ballots if ballot[winner] == score
+            )


Function AllocatedScore.reweight refactored with the following changes:

Convert for loop into call to sum() (sum-comprehension)

sourcery-ai · 2022-12-31T23:20:32Z

mwmethods.py

-        if upset > 0:
-            return runnerUp
-        else: return top
+        return runnerUp if upset > 0 else top


Function ASFinalRunoff.pickWinner refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-12-31T23:20:36Z

mwmethods.py

-        if upset > 0:
-            return runnerUp
-        else: return top
+        return runnerUp if upset > 0 else top


Function ASRunoffs.pickWinner refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-12-31T23:20:36Z

mwmethods.py

-        else:
-            scores = [sum(ballot[c]*ballot.weight for ballot in ballots) if c in bestCands else -1 for c in range(ncand)]
-            return scores.index(max(scores))
+        scores = [sum(ballot[c]*ballot.weight for ballot in ballots) if c in bestCands else -1 for c in range(ncand)]
+        return scores.index(max(scores))


Function SequentialMonroe.pickWinner refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2022-12-31T23:20:36Z

mwmethods.py

-            scoreSupport = 0
-            for ballot in ballots:
-                if ballot[winner] == score:
-                    scoreSupport += score*ballot.weight
+            scoreSupport = sum(
+                score * ballot.weight
+                for ballot in ballots
+                if ballot[winner] == score
+            )


Function S5H.reweight refactored with the following changes:

Convert for loop into call to sum() (sum-comprehension)

sourcery-ai · 2022-12-31T23:20:36Z

mwmethods.py

-        piles = [[] for i in range(nCands)]
+        piles = [[] for _ in range(nCands)]
        while len(winners) + len(candsLeft) > numWinners:
            cls.resort(ballotsToSort, candsLeft, piles)
-            newWinners = [c for c in candsLeft if sum(b.weight for b in piles[c]) >= quota]
-            if newWinners:
+            if newWinners := [
+                c for c in candsLeft if sum(b.weight for b in piles[c]) >= quota
+            ]:


Function STV.winnerSet refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

Use named expression to simplify assignment and conditional (use-named-expression)

Replace a for append loop with list extend (for-append-to-extend)

Simplify generator expression (simplify-generator)

sourcery-ai · 2022-12-31T23:20:36Z

mwmethods.py

-        piles = [[] for i in range(nCands)]
+        piles = [[] for _ in range(nCands)]
        while len(winners) < numWinners - 1 and len(winners) + len(candsLeft) > numWinners - 1:
            cls.resort(ballotsToSort, candsLeft, piles)
-            newWinners = [c for c in candsLeft if sum(b.weight for b in piles[c]) >= quota][:max(0, numWinners-len(winners)-1)]
-            if newWinners:
+            if newWinners := [
+                c for c in candsLeft if sum(b.weight for b in piles[c]) >= quota
+            ][: max(0, numWinners - len(winners) - 1)]:


Function MinimaxSTV.winnerSet refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

Use named expression to simplify assignment and conditional (use-named-expression)

Replace a for append loop with list extend (for-append-to-extend)

Simplify generator expression (simplify-generator)

sourcery-ai · 2022-12-31T23:20:37Z

stratFunctions.py

-        if callable(biaser):
-            bias = biaser(standings)
-        else:
-            bias = biaser
-        result= (standings[0:2] +
-                 [(standing - bias + numerator * (bias / max(i+2, 1)))
-                        for i, standing in enumerate(standings[2:])])
+        bias = biaser(standings) if callable(biaser) else biaser
+        result = standings[:2] + [
+            (standing - bias + numerator * (bias / max(i + 2, 1)))
+            for i, standing in enumerate(standings[2:])
+        ]


Function biasedMediaFor refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

sourcery-ai · 2022-12-31T23:20:38Z

stratFunctions.py

-        if callable(biaser):
-            bias = biaser(standings)
-        else:
-            bias = biaser
+        bias = biaser(standings) if callable(biaser) else biaser


Function skewedMediaFor refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-12-31T23:20:38Z

voterModels.py

-        if caring==None:
+        if caring is None:


Function DimVoter.fromDims refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2022-12-31T23:20:38Z

voterModels.py

-                subclusterMeans.append([random.gauss(0,sqrt(cares)) for i in range(self.dimsPerView[c])])
+                subclusterMeans.append(
+                    [
+                        random.gauss(0, sqrt(cares))
+                        for _ in range(self.dimsPerView[c])
+                    ]
+                )


Function KSElectorate.chooseClusters refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-12-31T23:20:38Z

vse.py

+    fgHelped = []
+    fgHarmed = []


Function threeRoundResults refactored with the following changes:

Hoist statements out of for/while loops (hoist-statement-from-loop)

Replace if statement with if expression (assign-if-exp)

Merge dictionary updates via the union operator (dict-assign-update-to-union)

This removes the following comments ( why? ):

#If not I should be quitting earlier than this but easier to just fake it. #zero-sized foreground

sourcery-ai bot requested a review from fsargent December 31, 2022 19:17

sourcery-ai bot commented Dec 31, 2022

View reviewed changes

sourcery-ai bot force-pushed the sourcery/fs/jquinn branch from 5b9b687 to d8b1513 Compare December 31, 2022 19:22

sourcery-ai bot commented Dec 31, 2022

View reviewed changes

'Refactored by Sourcery'

278cea6

sourcery-ai bot force-pushed the sourcery/fs/jquinn branch from d8b1513 to 278cea6 Compare December 31, 2022 23:19

sourcery-ai bot commented Dec 31, 2022

View reviewed changes

fsargent closed this Dec 31, 2022

sourcery-ai bot deleted the sourcery/fs/jquinn branch December 31, 2022 23:46

		pollErrors = [random.gauss(0, pollingError/2) for i in range(numCands)]
		pollErrors = [random.gauss(0, pollingError/2) for _ in range(numCands)]

		self.mNames = [m[0].__name__ + ':' + m[1].__name__ + str(m[2]) for m in ms]
		self.mNames = [f'{m[0].__name__}:{m[1].__name__}{str(m[2])}' for m in ms]

		Top2Version.__name__ = noRunoffMethod.__name__ + "Top2"
		Top2Version.__name__ = f"{noRunoffMethod.__name__}Top2"

		expectedUtility = sum(u for u in utils)/len(utils)
		expectedUtility = sum(utils) / len(utils)

		((frontId,frontResult), (targId, targResult)) = places[0:2]
		((frontId,frontResult), (targId, targResult)) = places[:2]

		matchupWins = [sum(1 for marg in row if marg > 0) for row in cmat]
		matchupWins = [sum(marg > 0 for marg in row) for row in cmat]

		expectedUtility = sum(u for u in utils) / len(utils)
		expectedUtility = sum(utils) / len(utils)

		if third == winner or third == runnerUp:
		if third in [winner, runnerUp]:

		((frontId, frontResult), (targId, targResult)) = places[0:2]
		((frontId, frontResult), (targId, targResult)) = places[:2]

Fs/jquinn (Sourcery refactored) #42

Fs/jquinn (Sourcery refactored) #42

Conversation

sourcery-ai bot commented Dec 31, 2022 • edited Loading

sourcery-ai bot left a comment

Choose a reason for hiding this comment

sourcery-ai bot commented Dec 31, 2022 • edited Loading

Sourcery Code Quality Report

Legend and Explanation

sourcery-ai bot left a comment

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot left a comment

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 31, 2022

sourcery-ai bot commented Dec 31, 2022 •

edited

Loading

sourcery-ai bot commented Dec 31, 2022 •

edited

Loading